From 7ecf76701ae65a821077b8bc8a4c6365ac3cf380 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 9 Oct 2025 16:43:10 +0700
Subject: [PATCH 1/2] fix(command):queryParams.year :newDate().getFullYear()

---
 src/modules/18_command/views/lists.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/modules/18_command/views/lists.vue b/src/modules/18_command/views/lists.vue
index 7df375d27..0bbca29a8 100644
--- a/src/modules/18_command/views/lists.vue
+++ b/src/modules/18_command/views/lists.vue
@@ -6,7 +6,6 @@ import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { useCommandListStore } from "@/modules/18_command/store/ListStore";
 import { usePagination } from "@/composables/usePagination";
-import { calculateFiscalYear } from "@/utils/function";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -37,7 +36,7 @@ const tabsManu = ref<ItemTabs[]>([
 ]);
 //ฟอร์มช้อมูลการค้นหา
 const queryParams = reactive<FormQuery>({
-  year: calculateFiscalYear(new Date()), //ปีงบประมาณ
+  year: new Date().getFullYear(), //พ.ศ.
   keyword: "", //คำค้นหา
   commandTypeId: "",
 });
@@ -126,7 +125,7 @@ onMounted(async () => {
               :model-value="
                 queryParams.year == null ? null : queryParams.year + 543
               "
-              :label="`${'ปีงบประมาณ'}`"
+              :label="`${'พ.ศ.'}`"
             >
               <template v-slot:prepend>
                 <q-icon

From f3bd67c93fd1a394cea0aae06f564f64eb2bf945 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 9 Oct 2025 17:02:11 +0700
Subject: [PATCH 2/2] fix:label q-input year

---
 .../detail/GovernmentInformation/07_Position.vue          | 4 ++--
 .../components/detail/Salary/01_PositionSalary.vue        | 4 ++--
 .../views/edit/components/FormPosition.vue                | 4 ++--
 .../04_registryPerson/views/edit/components/Table.vue     | 2 +-
 .../05_placement/components/probation/MainSurvey.vue      | 2 +-
 src/modules/06_retirement/views/01_retirement.vue         | 2 +-
 .../11_discipline/components/9_DisciplineReport/Main.vue  | 2 +-
 src/modules/18_command/components/DialogCreateCommand.vue | 8 ++++----
 .../18_command/components/DialogCreateCommandORG.vue      | 4 ++--
 .../18_command/components/Main/DialogFormCommand.vue      | 4 ++--
 src/modules/18_command/components/Step/1_Detail.vue       | 2 +-
 src/modules/18_command/views/lists.vue                    | 2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
index 6c715a085..f7520694d 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -1154,7 +1154,7 @@ onMounted(async () => {
                 </div>
                 <label class="col-1 flex justify-center items-center">/</label>
                 <div class="col-5">
-                  <!-- :rules="[(val:string) => !!val || `${'กรุณากรอก พ.ศ.'}`]" -->
+                  <!-- :rules="[(val:string) => !!val || 'กรุณากรอกปี พ.ศ.']" -->
                   <datepicker
                     menu-class-name="modalfix"
                     v-model="formData.commandYear"
@@ -1178,7 +1178,7 @@ onMounted(async () => {
                             ? null
                             : formData.commandYear + 543
                         "
-                        :label="`${'พ.ศ.'}`"
+                        label="ปี พ.ศ."
                       >
                         <template v-slot:prepend>
                           <q-icon
diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
index d2bf97952..a17157593 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -1118,7 +1118,7 @@ onMounted(async () => {
                 </div>
                 <label class="col-1 flex justify-center items-center">/</label>
                 <div class="col-5">
-                  <!-- :rules="[(val:string) => !!val || `${'กรุณากรอก พ.ศ.'}`]" -->
+                  <!-- :rules="[(val:string) => !!val || 'กรุณากรอกปี พ.ศ.']" -->
                   <datepicker
                     menu-class-name="modalfix"
                     v-model="formData.commandYear"
@@ -1142,7 +1142,7 @@ onMounted(async () => {
                             ? null
                             : formData.commandYear + 543
                         "
-                        :label="`${'พ.ศ.'}`"
+                        label="ปี พ.ศ."
                       >
                         <template v-slot:prepend>
                           <q-icon
diff --git a/src/modules/04_registryPerson/views/edit/components/FormPosition.vue b/src/modules/04_registryPerson/views/edit/components/FormPosition.vue
index ad706583c..6a459c9ec 100644
--- a/src/modules/04_registryPerson/views/edit/components/FormPosition.vue
+++ b/src/modules/04_registryPerson/views/edit/components/FormPosition.vue
@@ -253,8 +253,8 @@ function classInput(val: boolean) {
                     ? null
                     : formData.commandYear + 543
                 "
-                :label="`${'พ.ศ.'}`"
-                :rules="isAddPosition ? [(val:string) => !!val || `${'กรุณากรอก พ.ศ.'}`] : []"
+                label="ปี พ.ศ."
+                :rules="isAddPosition ? [(val:string) => !!val || 'กรุณากรอกปี พ.ศ.'] : []"
                 clearable
                 @clear="formData.commandYear = null"
               >
diff --git a/src/modules/04_registryPerson/views/edit/components/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue
index 0edba5461..c93771d7e 100644
--- a/src/modules/04_registryPerson/views/edit/components/Table.vue
+++ b/src/modules/04_registryPerson/views/edit/components/Table.vue
@@ -1112,7 +1112,7 @@ onMounted(async () => {
                               ? null
                               : formData.commandYear + 543
                           "
-                          :label="`${'พ.ศ.'}`"
+                          label="ปี พ.ศ."
                           clearable
                           @clear="formData.commandYear = null"
                           @update:model-value="onUpdateData"
diff --git a/src/modules/05_placement/components/probation/MainSurvey.vue b/src/modules/05_placement/components/probation/MainSurvey.vue
index 6290b910e..103081e4e 100644
--- a/src/modules/05_placement/components/probation/MainSurvey.vue
+++ b/src/modules/05_placement/components/probation/MainSurvey.vue
@@ -156,7 +156,7 @@ onMounted(async () => {
                   outlined
                   hide-bottom-space
                   :model-value="year === null ? 'ทั้งหมด' : Number(year) + 543"
-                  :label="`${'ปีพ.ศ.'}`"
+                  :label="`${'ปี พ.ศ.'}`"
                 >
                 </q-input>
               </template>
diff --git a/src/modules/06_retirement/views/01_retirement.vue b/src/modules/06_retirement/views/01_retirement.vue
index a3483f52a..9eb24ae09 100644
--- a/src/modules/06_retirement/views/01_retirement.vue
+++ b/src/modules/06_retirement/views/01_retirement.vue
@@ -248,7 +248,7 @@ onMounted(async () => {
                     :model-value="
                       fiscalyear === null ? 'ทั้งหมด' : Number(fiscalyear) + 543
                     "
-                    :label="`${'ปีพ.ศ.'}`"
+                    :label="`${'ปี พ.ศ.'}`"
                   >
                   </q-input>
                 </template>
diff --git a/src/modules/11_discipline/components/9_DisciplineReport/Main.vue b/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
index 7ece8bfbd..cc1d00e46 100644
--- a/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
+++ b/src/modules/11_discipline/components/9_DisciplineReport/Main.vue
@@ -508,7 +508,7 @@ onMounted(async () => {
                           dense
                           borderless
                           :model-value="Number(year) + 543"
-                          :label="`${'ปีพ.ศ.'}`"
+                          :label="`${'ปี พ.ศ.'}`"
                         >
                           <template v-slot:prepend>
                             <q-icon
diff --git a/src/modules/18_command/components/DialogCreateCommand.vue b/src/modules/18_command/components/DialogCreateCommand.vue
index 0c8d17e03..d29ce53f6 100644
--- a/src/modules/18_command/components/DialogCreateCommand.vue
+++ b/src/modules/18_command/components/DialogCreateCommand.vue
@@ -438,8 +438,8 @@ watch(
                     :model-value="
                       commandYear == null ? null : commandYear + 543
                     "
-                    :label="`${'พ.ศ.'}`"
-                    :rules="[(val:string) => !!val || `${'กรุณากรอก พ.ศ.'}`]"
+                    label="ปี พ.ศ."
+                    :rules="[(val:string) => !!val || 'กรุณากรอกปี พ.ศ.']"
                   >
                     <template v-slot:prepend>
                       <q-icon
@@ -478,8 +478,8 @@ watch(
                   outlined
                   hide-bottom-space
                   :model-value="commandYear == null ? null : commandYear + 543"
-                  :label="`${'พ.ศ.'}`"
-                  :rules="[(val:string) => !!val || `${'กรุณากรอก พ.ศ.'}`]"
+                  label="ปี พ.ศ."
+                  :rules="[(val:string) => !!val || 'กรุณากรอกปี พ.ศ.']"
                 >
                   <template v-slot:prepend>
                     <q-icon
diff --git a/src/modules/18_command/components/DialogCreateCommandORG.vue b/src/modules/18_command/components/DialogCreateCommandORG.vue
index 54f99f11e..7f8a71c52 100644
--- a/src/modules/18_command/components/DialogCreateCommandORG.vue
+++ b/src/modules/18_command/components/DialogCreateCommandORG.vue
@@ -431,8 +431,8 @@ watch(modal, async () => {
                     :model-value="
                       commandYear == null ? null : commandYear + 543
                     "
-                    :label="`${'พ.ศ.'}`"
-                    :rules="[(val:string) => !!val || `${'กรุณากรอก พ.ศ.'}`]"
+                    label="ปี พ.ศ."
+                    :rules="[(val:string) => !!val || 'กรุณากรอกปี พ.ศ.']"
                   >
                     <template v-slot:prepend>
                       <q-icon
diff --git a/src/modules/18_command/components/Main/DialogFormCommand.vue b/src/modules/18_command/components/Main/DialogFormCommand.vue
index 5b5616415..47b3bad01 100644
--- a/src/modules/18_command/components/Main/DialogFormCommand.vue
+++ b/src/modules/18_command/components/Main/DialogFormCommand.vue
@@ -182,8 +182,8 @@ watch(modal, () => {
                     :model-value="
                       commandYear == null ? null : commandYear + 543
                     "
-                    :label="`${'พ.ศ.'}`"
-                    :rules="[(val:string) => !!val || `${'กรุณากรอก พ.ศ.'}`]"
+                    label="ปี พ.ศ."
+                    :rules="[(val:string) => !!val || 'กรุณากรอกปี พ.ศ.']"
                   >
                     <template v-slot:prepend>
                       <q-icon
diff --git a/src/modules/18_command/components/Step/1_Detail.vue b/src/modules/18_command/components/Step/1_Detail.vue
index 2317b0526..34d7cd38e 100644
--- a/src/modules/18_command/components/Step/1_Detail.vue
+++ b/src/modules/18_command/components/Step/1_Detail.vue
@@ -210,7 +210,7 @@ onMounted(async () => {
                         ? null
                         : formData.commandYear + 543
                     "
-                    :label="`${'พ.ศ.'}`"
+                    label="ปี พ.ศ."
                   >
                     <template v-slot:prepend>
                       <q-icon
diff --git a/src/modules/18_command/views/lists.vue b/src/modules/18_command/views/lists.vue
index 0bbca29a8..f3d66afbe 100644
--- a/src/modules/18_command/views/lists.vue
+++ b/src/modules/18_command/views/lists.vue
@@ -125,7 +125,7 @@ onMounted(async () => {
               :model-value="
                 queryParams.year == null ? null : queryParams.year + 543
               "
-              :label="`${'พ.ศ.'}`"
+              label="ปี พ.ศ."
             >
               <template v-slot:prepend>
                 <q-icon