Merge branch 'develop' into nice_dev

# Conflicts: # src/modules/11_discipline/router.ts
2023-10-17 17:49:31 +07:00 · 2023-10-17 17:49:31 +07:00 · 5b210fca60
commit 5b210fca60
parent cc7d32bf3d b9584e006b
26 changed files with 4121 additions and 648 deletions
--- a/src/modules/11_discipline/components/1_Complaint/MainPage.vue
+++ b/src/modules/11_discipline/components/1_Complaint/MainPage.vue
@ -162,7 +162,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
            color="primary"
            icon="mdi-plus"
            @click="redirectToPageadd()"
-            ><q-tooltip>เพิ่ม</q-tooltip></q-btn
+            ><q-tooltip>เพิ่มเรื่องร้องเรียน </q-tooltip></q-btn
          >
          <q-space />
          <div class="col-2">