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([ ]); //ฟอร์มช้อมูลการค้นหา const queryParams = reactive({ - 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="`${'พ.ศ.'}`" >