fix bug ==> loading
This commit is contained in:
parent
31755747da
commit
e28e9bc3aa
6 changed files with 12 additions and 27 deletions
|
|
@ -404,11 +404,7 @@ function getSearch() {
|
||||||
:props="props"
|
:props="props"
|
||||||
>
|
>
|
||||||
<div v-if="col.name == 'no'">
|
<div v-if="col.name == 'no'">
|
||||||
{{
|
{{ props.rowIndex + 1 }}
|
||||||
(pagination.page - 1) * pagination.rowsPerPage +
|
|
||||||
props.rowIndex +
|
|
||||||
1
|
|
||||||
}}
|
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
{{ col.value ? col.value : "-" }}
|
{{ col.value ? col.value : "-" }}
|
||||||
|
|
|
||||||
|
|
@ -197,7 +197,7 @@ onMounted(async () => {
|
||||||
:props="props"
|
:props="props"
|
||||||
@click="onClickView(props.row.id, props.row.status)"
|
@click="onClickView(props.row.id, props.row.status)"
|
||||||
>
|
>
|
||||||
{{ (page - 1) * pageSize + props.rowIndex + 1 }}
|
{{ props.rowIndex + 1 }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td
|
<q-td
|
||||||
key="leaveTypeName"
|
key="leaveTypeName"
|
||||||
|
|
|
||||||
|
|
@ -261,7 +261,6 @@ function onTableRequest(requestProps: PropsTable.RequestProps) {
|
||||||
:virtual-scroll-sticky-size-start="48"
|
:virtual-scroll-sticky-size-start="48"
|
||||||
dense
|
dense
|
||||||
:rows-per-page-options="[10, 25, 50, 100]"
|
:rows-per-page-options="[10, 25, 50, 100]"
|
||||||
D
|
|
||||||
v-model:pagination="pagination"
|
v-model:pagination="pagination"
|
||||||
@request="onTableRequest"
|
@request="onTableRequest"
|
||||||
:grid="$q.screen.gt.xs ? false : true"
|
:grid="$q.screen.gt.xs ? false : true"
|
||||||
|
|
|
||||||
|
|
@ -398,11 +398,7 @@ onMounted(async () => {
|
||||||
@click.stop.prevent="editPage(props.row.id)"
|
@click.stop.prevent="editPage(props.row.id)"
|
||||||
>
|
>
|
||||||
<div v-if="col.name == 'no'">
|
<div v-if="col.name == 'no'">
|
||||||
{{
|
{{ props.rowIndex + 1 }}
|
||||||
(pagination.page - 1) * pagination.rowsPerPage +
|
|
||||||
props.rowIndex +
|
|
||||||
1
|
|
||||||
}}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-else>
|
<div v-else>
|
||||||
|
|
|
||||||
|
|
@ -109,12 +109,11 @@ function onEdit(id: string) {
|
||||||
|
|
||||||
async function getProfileId() {
|
async function getProfileId() {
|
||||||
isLoad.value = true;
|
isLoad.value = true;
|
||||||
if (dataStore.profileId) {
|
|
||||||
profilId.value = dataStore.profileId;
|
|
||||||
} else {
|
|
||||||
try {
|
try {
|
||||||
|
if (!dataStore.profileId) {
|
||||||
const res = await http.get(config.API.profilePosition());
|
const res = await http.get(config.API.profilePosition());
|
||||||
dataStore.profileId = res.data.result.profileId;
|
dataStore.profileId = res.data.result.profileId;
|
||||||
|
}
|
||||||
profilId.value = dataStore.profileId;
|
profilId.value = dataStore.profileId;
|
||||||
await getData();
|
await getData();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
@ -123,7 +122,6 @@ async function getProfileId() {
|
||||||
isLoad.value = false;
|
isLoad.value = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function convertType(val: string) {
|
function convertType(val: string) {
|
||||||
switch (val) {
|
switch (val) {
|
||||||
|
|
|
||||||
|
|
@ -395,11 +395,7 @@ onMounted(async () => {
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
<div v-if="col.name == 'no'">
|
<div v-if="col.name == 'no'">
|
||||||
{{
|
{{ props.rowIndex + 1 }}
|
||||||
(pagination.page - 1) * pagination.rowsPerPage +
|
|
||||||
props.rowIndex +
|
|
||||||
1
|
|
||||||
}}
|
|
||||||
</div>
|
</div>
|
||||||
<div v-else-if="col.name === 'document'">
|
<div v-else-if="col.name === 'document'">
|
||||||
<q-btn
|
<q-btn
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue