From 8c68986549f374348011e7059d92d66ca58f503a Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Thu, 22 Feb 2024 17:27:05 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20maxpage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/registry/registry.vue | 1 + .../components/probation/MainProbation.vue | 1 + .../components/SalaryLists/TabGroup.vue | 180 ++++++++++++++ .../components/SalaryLists/TableTabType1.vue | 233 ++++++++++++++++++ .../components/SalaryLists/TableTabType2.vue | 6 + .../components/SalaryLists/TableTabType3.vue | 6 + .../components/SalaryLists/TableTabType4.vue | 6 + .../13_salary/store/SalaryListsStore.ts | 8 + src/modules/13_salary/views/salaryChart.vue | 1 + src/modules/13_salary/views/salaryLists.vue | 14 +- src/modules/13_salary/views/salaryRate.vue | 1 + 11 files changed, 455 insertions(+), 2 deletions(-) create mode 100644 src/modules/13_salary/components/SalaryLists/TableTabType1.vue create mode 100644 src/modules/13_salary/components/SalaryLists/TableTabType2.vue create mode 100644 src/modules/13_salary/components/SalaryLists/TableTabType3.vue create mode 100644 src/modules/13_salary/components/SalaryLists/TableTabType4.vue create mode 100644 src/modules/13_salary/store/SalaryListsStore.ts diff --git a/src/modules/04_registryNew/components/registry/registry.vue b/src/modules/04_registryNew/components/registry/registry.vue index 758c15e17..0527e9303 100644 --- a/src/modules/04_registryNew/components/registry/registry.vue +++ b/src/modules/04_registryNew/components/registry/registry.vue @@ -476,6 +476,7 @@ async function changeCardID(citizenId: string | number | null) { active-color="primary" color="dark" :max="maxPage" + :max-pages="5" size="sm" boundary-links direction-links diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue index fe8f0f544..2b519e827 100644 --- a/src/modules/05_placement/components/probation/MainProbation.vue +++ b/src/modules/05_placement/components/probation/MainProbation.vue @@ -752,6 +752,7 @@ onMounted(async () => { size="sm" boundary-links direction-links + :max-pages="5" > diff --git a/src/modules/13_salary/components/SalaryLists/TabGroup.vue b/src/modules/13_salary/components/SalaryLists/TabGroup.vue index e69de29bb..dd31657cb 100644 --- a/src/modules/13_salary/components/SalaryLists/TabGroup.vue +++ b/src/modules/13_salary/components/SalaryLists/TabGroup.vue @@ -0,0 +1,180 @@ + + + + + diff --git a/src/modules/13_salary/components/SalaryLists/TableTabType1.vue b/src/modules/13_salary/components/SalaryLists/TableTabType1.vue new file mode 100644 index 000000000..7832dc9f9 --- /dev/null +++ b/src/modules/13_salary/components/SalaryLists/TableTabType1.vue @@ -0,0 +1,233 @@ + + + + diff --git a/src/modules/13_salary/components/SalaryLists/TableTabType2.vue b/src/modules/13_salary/components/SalaryLists/TableTabType2.vue new file mode 100644 index 000000000..058e5ba78 --- /dev/null +++ b/src/modules/13_salary/components/SalaryLists/TableTabType2.vue @@ -0,0 +1,6 @@ + + + + diff --git a/src/modules/13_salary/components/SalaryLists/TableTabType3.vue b/src/modules/13_salary/components/SalaryLists/TableTabType3.vue new file mode 100644 index 000000000..ecebac15b --- /dev/null +++ b/src/modules/13_salary/components/SalaryLists/TableTabType3.vue @@ -0,0 +1,6 @@ + + + + diff --git a/src/modules/13_salary/components/SalaryLists/TableTabType4.vue b/src/modules/13_salary/components/SalaryLists/TableTabType4.vue new file mode 100644 index 000000000..d3416b233 --- /dev/null +++ b/src/modules/13_salary/components/SalaryLists/TableTabType4.vue @@ -0,0 +1,6 @@ + + + + diff --git a/src/modules/13_salary/store/SalaryListsStore.ts b/src/modules/13_salary/store/SalaryListsStore.ts new file mode 100644 index 000000000..504dc9b35 --- /dev/null +++ b/src/modules/13_salary/store/SalaryListsStore.ts @@ -0,0 +1,8 @@ +import { defineStore } from "pinia"; +import { ref } from "vue"; + +export const useSalaryListSDataStore = defineStore("salaryListStore", () => { + const tabGroup = ref("group1"); + const tabType = ref("tab1"); + return { tabGroup, tabType }; +}); diff --git a/src/modules/13_salary/views/salaryChart.vue b/src/modules/13_salary/views/salaryChart.vue index 611a91217..2c57a3d1c 100644 --- a/src/modules/13_salary/views/salaryChart.vue +++ b/src/modules/13_salary/views/salaryChart.vue @@ -364,6 +364,7 @@ async function filterFn(page: number) { size="sm" boundary-links direction-links + :max-pages="5" > diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue index cf4e87628..00c235fc0 100644 --- a/src/modules/13_salary/views/salaryLists.vue +++ b/src/modules/13_salary/views/salaryLists.vue @@ -1,4 +1,6 @@ - + - \ No newline at end of file + diff --git a/src/modules/13_salary/views/salaryRate.vue b/src/modules/13_salary/views/salaryRate.vue index 1aaa946f0..887634fd9 100644 --- a/src/modules/13_salary/views/salaryRate.vue +++ b/src/modules/13_salary/views/salaryRate.vue @@ -364,6 +364,7 @@ watch([() => formQuery.page, () => formQuery.pageSize], async () => { size="sm" boundary-links direction-links + :max-pages="5" >