From df5860256326441ae1183a11be2c09ef4412468f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 29 Feb 2024 15:00:30 +0700
Subject: [PATCH] =?UTF-8?q?=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80?=
 =?UTF-8?q?=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=20=3D>=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=20validate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../13_salary/components/SalaryLists/DialogFormEdit.vue   | 8 +++++++-
 .../13_salary/components/SalaryLists/DialogMoveGroup.vue  | 1 -
 .../13_salary/components/SalaryLists/DialogMoveLevel.vue  | 1 -
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/modules/13_salary/components/SalaryLists/DialogFormEdit.vue b/src/modules/13_salary/components/SalaryLists/DialogFormEdit.vue
index 028ddd183..832096723 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogFormEdit.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogFormEdit.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { ref } from "vue";
 import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -24,9 +25,13 @@ const props = defineProps({
   },
 });
 
+const amountRef = ref<any>();
+
 /** ฟังก์ชั่นสำหรับ validate ฟอร์ม */
 function validateForm() {
-  onSubmit();
+  if (amountRef.value.validate()) {
+    onSubmit();
+  }
 }
 
 /** function ปืด Popup */
@@ -73,6 +78,7 @@ function onSubmit() {
       <q-card-section class="scroll" style="max-height: 70vh">
         <div class="q-gutter-y-sm">
           <q-input
+            ref="amountRef"
             dense
             outlined
             v-model="amount"
diff --git a/src/modules/13_salary/components/SalaryLists/DialogMoveGroup.vue b/src/modules/13_salary/components/SalaryLists/DialogMoveGroup.vue
index f39b14550..f9cba5cab 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogMoveGroup.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogMoveGroup.vue
@@ -34,7 +34,6 @@ const isReadonly = ref<boolean>(false); // อ่านได้อย่าง
 
 /*** ฟังก์ชั่นสำหรับ validate ฟอร์ม */
 function validateForm() {
-  groupRef.value.validate();
   if (groupRef.value.validate()) {
     onSubmit();
   }
diff --git a/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue b/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
index 8d0d7a2dd..927edf3d1 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
@@ -47,7 +47,6 @@ const typeRangeOps = computed(() => {
 
 /*** ฟังก์ชั่นสำหรับ validate ฟอร์ม */
 function validateForm() {
-  typeRef.value.validate();
   if (typeRef.value.validate()) {
     onSubmit();
   }