Merge branch 'NiceDev' into develop

2025-05-23 11:49:04 +07:00 · 2025-05-23 11:49:04 +07:00 · 3e2939f060
commit 3e2939f060
parent a87c2d30fe 22f223178a
24 changed files with 24 additions and 24 deletions
--- a/src/modules/02_transfer/views/Main.vue
+++ b/src/modules/02_transfer/views/Main.vue
@ -219,7 +219,7 @@ onMounted(async () => {
                debounce="300"
                placeholder="ค้นหา"
                style="max-width: 200px"
-                @keydown.enter="onSearch"
+                @keydown.enter.prevent="onSearch"
              >
                <template v-slot:append>
                  <q-icon name="search" />
--- a/src/modules/08_KPI/components/Tab/02_Evaluator.vue
+++ b/src/modules/08_KPI/components/Tab/02_Evaluator.vue
@ -175,7 +175,7 @@ onMounted(() => {
          debounce="300"
          v-model="filterKeyword"
          placeholder="ค้นหา"
-          @keydown.enter="onSearch"
+          @keydown.enter.prevent="onSearch"
        >
          <template v-slot:append>
            <q-icon name="search" />
--- a/src/modules/10_registry/01_Information/02_ChangeName.vue
+++ b/src/modules/10_registry/01_Information/02_ChangeName.vue
@ -279,7 +279,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/01_Information/05_Educations.vue
+++ b/src/modules/10_registry/01_Information/05_Educations.vue
@ -581,7 +581,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/01_Information/06_Ability.vue
+++ b/src/modules/10_registry/01_Information/06_Ability.vue
@ -287,7 +287,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/02_Government/03_Leave.vue
+++ b/src/modules/10_registry/02_Government/03_Leave.vue
@ -361,7 +361,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/02_Government/04_Duty.vue
+++ b/src/modules/10_registry/02_Government/04_Duty.vue
@ -320,7 +320,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/02_Government/05_Actposition.vue
+++ b/src/modules/10_registry/02_Government/05_Actposition.vue
@ -260,7 +260,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/02_Government/06_Assistance.vue
+++ b/src/modules/10_registry/02_Government/06_Assistance.vue
@ -337,7 +337,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/02_Government/07_Position.vue
+++ b/src/modules/10_registry/02_Government/07_Position.vue
@ -501,7 +501,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/03_Salary/01_Salary.vue
+++ b/src/modules/10_registry/03_Salary/01_Salary.vue
@ -703,7 +703,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/03_Salary/02_Nopaid.vue
+++ b/src/modules/10_registry/03_Salary/02_Nopaid.vue
@ -301,7 +301,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/04_Achievement/01_Certificate.vue
+++ b/src/modules/10_registry/04_Achievement/01_Certificate.vue
@ -302,7 +302,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/04_Achievement/02_Training.vue
+++ b/src/modules/10_registry/04_Achievement/02_Training.vue
@ -419,7 +419,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/04_Achievement/03_Insignia.vue
+++ b/src/modules/10_registry/04_Achievement/03_Insignia.vue
@ -517,7 +517,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/04_Achievement/04_Honor.vue
+++ b/src/modules/10_registry/04_Achievement/04_Honor.vue
@ -301,7 +301,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue
+++ b/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue
@ -225,7 +225,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/05_Other/01_Other.vue
+++ b/src/modules/10_registry/05_Other/01_Other.vue
@ -205,7 +205,7 @@ onMounted(async () => {
        v-model="filter"
        label="ค้นหา"
        style="max-width: 200px"
-        @keydown.enter="onSearch"
+        @keydown.enter.prevent="onSearch"
      >
        <template v-slot:append>
          <q-icon name="search" />
--- a/src/modules/10_registry/Dialog/DialogHistory.vue
+++ b/src/modules/10_registry/Dialog/DialogHistory.vue
@ -88,7 +88,7 @@ watch(
              dense
              v-model="filter"
              label="ค้นหา"
-              @keydown.enter="onSearch"
+              @keydown.enter.prevent="onSearch"
            >
              <template v-slot:append>
                <q-icon name="search" />
--- a/src/modules/10_registry/views/requestEditMain.vue
+++ b/src/modules/10_registry/views/requestEditMain.vue
@ -360,7 +360,7 @@ onMounted(async () => {
              clearable
              dense
              label="ค้นหา"
-              @keydown.enter="updateStatusValue()"
+              @keydown.enter.prevent="updateStatusValue()"
            >
            </q-input>
          </div>
--- a/src/modules/11_probation/views/main.vue
+++ b/src/modules/11_probation/views/main.vue
@ -301,7 +301,7 @@ onMounted(async () => {
                v-model="filter"
                label="ค้นหา"
                :style="mode ? `max-width: 200px` : `max-width: 150px`"
-                @keydown.enter="onSearch"
+                @keydown.enter.prevent="onSearch"
              >
                <template v-slot:append>
                  <q-icon name="search" />
--- a/src/modules/11_probation/views/mainDetail.vue
+++ b/src/modules/11_probation/views/mainDetail.vue
@ -337,7 +337,7 @@ onMounted(async () => {
                v-model="filter"
                label="ค้นหา"
                :style="mode ? `max-width: 200px` : `max-width: 150px`"
-                @keydown.enter="onSearch"
+                @keydown.enter.prevent="onSearch"
              >
                <template v-slot:append>
                  <q-icon name="search" />
--- a/src/modules/13_portfolio/views/Main.vue
+++ b/src/modules/13_portfolio/views/Main.vue
@ -173,7 +173,7 @@ onMounted(async () => {
                debounce="300"
                placeholder="ค้นหา"
                style="max-width: 200px"
-                @keydown.enter="onSearch"
+                @keydown.enter.prevent="onSearch"
              >
                <template v-slot:append>
                  <q-icon name="search" />
--- a/src/modules/14_IDP/views/main.vue
+++ b/src/modules/14_IDP/views/main.vue
@ -346,7 +346,7 @@ onMounted(async () => {
              outlined
              dense
              label="ค้นหา"
-              @keydown.enter="getSerach()"
+              @keydown.enter.prevent="getSerach()"
              style="width: 200px"
            >
              <template v-slot:append>