เงินเดิอด=> fix bug
This commit is contained in:
parent
1f679bd6b4
commit
1065ea1816
2 changed files with 7 additions and 10 deletions
|
|
@ -53,7 +53,6 @@ const nextPage = ref<number>(1);
|
|||
|
||||
/**function เรียกข้อมูลรอบการขึ้นค่าจ้าง*/
|
||||
function getRound() {
|
||||
roundOptions.value = [];
|
||||
isDisable.value = false;
|
||||
showLoader();
|
||||
http
|
||||
|
|
@ -62,11 +61,13 @@ function getRound() {
|
|||
`?page=${page.value}&pageSize=${pageSize.value}&keyword=&year=0`
|
||||
)
|
||||
.then(async (res) => {
|
||||
roundOptions.value = [];
|
||||
roundFilter.value = [];
|
||||
const data = res.data.result.data;
|
||||
if (data.length !== 0) {
|
||||
isDisable.value = true;
|
||||
lastPage.value = Math.ceil(res.data.result.total / pageSize.value);
|
||||
const optionMain = await data.map((x: DataRound) => ({
|
||||
roundOptions.value = await data.map((x: DataRound) => ({
|
||||
id: x.id,
|
||||
revisionId: x.revisionId,
|
||||
shortCode: x.period,
|
||||
|
|
@ -79,9 +80,7 @@ function getRound() {
|
|||
? "รอบพิเศษ "
|
||||
: "รอบเมษายน ",
|
||||
}));
|
||||
roundOptions.value.push(...optionMain);
|
||||
|
||||
roundFilter.value = await [];
|
||||
roundFilter.value = await (roundOptions.value
|
||||
? roundOptions.value[0]
|
||||
: "");
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ const nextPage = ref<number>(1);
|
|||
|
||||
/**function เรียกข้อมูลรอบการขึ้นเงินเดือน*/
|
||||
function getRound() {
|
||||
roundOptions.value = [];
|
||||
showLoader();
|
||||
isDisable.value = false;
|
||||
http
|
||||
|
|
@ -61,11 +60,13 @@ function getRound() {
|
|||
`?page=${page.value}&pageSize=${pageSize.value}&keyword=&year=0`
|
||||
)
|
||||
.then(async (res) => {
|
||||
roundOptions.value = [];
|
||||
roundFilter.value = [];
|
||||
const data = res.data.result.data;
|
||||
if (data.length !== 0) {
|
||||
isDisable.value = true;
|
||||
lastPage.value = Math.ceil(res.data.result.total / pageSize.value);
|
||||
const optionMain = await data.map((x: DataRound) => ({
|
||||
roundOptions.value = await data.map((x: DataRound) => ({
|
||||
id: x.id,
|
||||
revisionId: x.revisionId,
|
||||
shortCode: x.period,
|
||||
|
|
@ -78,9 +79,7 @@ function getRound() {
|
|||
? "รอบพิเศษ "
|
||||
: "รอบเมษายน ",
|
||||
}));
|
||||
roundOptions.value.push(...optionMain);
|
||||
|
||||
roundFilter.value = await [];
|
||||
roundFilter.value = await (roundOptions.value
|
||||
? roundOptions.value[0]
|
||||
: "");
|
||||
|
|
@ -348,14 +347,13 @@ onMounted(() => {
|
|||
</div>
|
||||
<q-space />
|
||||
<datepicker
|
||||
menu-class-name="modalfix"
|
||||
v-model="year"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
year-picker
|
||||
:enableTimePicker="false"
|
||||
style="width: 150px"
|
||||
@update:model-value="getRound"
|
||||
@update:model-value="getRound()"
|
||||
>
|
||||
<template #year="{ year }">{{ year + 543 }}</template>
|
||||
<template #year-overlay-value="{ value }">{{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue