diff --git a/src/modules/05_leave/components/FormLeave/Form.vue b/src/modules/05_leave/components/FormLeave/Form.vue
index b366057..db9bd7b 100644
--- a/src/modules/05_leave/components/FormLeave/Form.vue
+++ b/src/modules/05_leave/components/FormLeave/Form.vue
@@ -404,11 +404,7 @@ function getSearch() {
:props="props"
>
- {{
- (pagination.page - 1) * pagination.rowsPerPage +
- props.rowIndex +
- 1
- }}
+ {{ props.rowIndex + 1 }}
{{ col.value ? col.value : "-" }}
diff --git a/src/modules/05_leave/components/ListView.vue b/src/modules/05_leave/components/ListView.vue
index 3dbefca..3f4235a 100644
--- a/src/modules/05_leave/components/ListView.vue
+++ b/src/modules/05_leave/components/ListView.vue
@@ -197,7 +197,7 @@ onMounted(async () => {
:props="props"
@click="onClickView(props.row.id, props.row.status)"
>
- {{ (page - 1) * pageSize + props.rowIndex + 1 }}
+ {{ props.rowIndex + 1 }}
{
@click.stop.prevent="editPage(props.row.id)"
>
- {{
- (pagination.page - 1) * pagination.rowsPerPage +
- props.rowIndex +
- 1
- }}
+ {{ props.rowIndex + 1 }}
diff --git a/src/modules/09_scholarship/views/main.vue b/src/modules/09_scholarship/views/main.vue
index e9d3036..0d873c6 100644
--- a/src/modules/09_scholarship/views/main.vue
+++ b/src/modules/09_scholarship/views/main.vue
@@ -109,19 +109,17 @@ function onEdit(id: string) {
async function getProfileId() {
isLoad.value = true;
- if (dataStore.profileId) {
- profilId.value = dataStore.profileId;
- } else {
- try {
+ try {
+ if (!dataStore.profileId) {
const res = await http.get(config.API.profilePosition());
dataStore.profileId = res.data.result.profileId;
- profilId.value = dataStore.profileId;
- await getData();
- } catch (e) {
- messageError($q, e);
- } finally {
- isLoad.value = false;
}
+ profilId.value = dataStore.profileId;
+ await getData();
+ } catch (e) {
+ messageError($q, e);
+ } finally {
+ isLoad.value = false;
}
}
diff --git a/src/modules/14_IDP/views/main.vue b/src/modules/14_IDP/views/main.vue
index 5d84827..e29f30e 100644
--- a/src/modules/14_IDP/views/main.vue
+++ b/src/modules/14_IDP/views/main.vue
@@ -395,11 +395,7 @@ onMounted(async () => {
"
>
- {{
- (pagination.page - 1) * pagination.rowsPerPage +
- props.rowIndex +
- 1
- }}
+ {{ props.rowIndex + 1 }}