From 84978b8ada6ff5382e1622f5ebcf806b32e60552 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 28 Feb 2024 15:10:09 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94?=
 =?UTF-8?q?=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/SalaryLists/DialogFormEdit.vue      | 11 +----------
 .../components/SalaryLists/DialogMoveGroup.vue     | 10 +++++++---
 .../components/SalaryLists/DialogMoveLevel.vue     | 14 +++++++++-----
 .../13_salary/components/SalaryLists/TabMain.vue   |  1 +
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/modules/13_salary/components/SalaryLists/DialogFormEdit.vue b/src/modules/13_salary/components/SalaryLists/DialogFormEdit.vue
index b81c553c1..342b1f64d 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogFormEdit.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogFormEdit.vue
@@ -34,7 +34,7 @@ function close() {
 
 function onSubmit() {
   dialogConfirm($q, () => {
-    if (amount.value) {
+    if (amount.value !== null) {
       const amountString: string = amount.value.toString();
       const body = {
         profileId: profileId.value,
@@ -58,13 +58,6 @@ function onSubmit() {
     }
   });
 }
-
-function inputEdit(val: boolean) {
-  return {
-    "full-width cursor-pointer inputgreen ": val,
-    "full-width cursor-pointer inputgreen": !val,
-  };
-}
 </script>
 
 <template>
@@ -76,7 +69,6 @@ function inputEdit(val: boolean) {
       <q-card-section class="scroll" style="max-height: 70vh">
         <div class="q-gutter-y-sm">
           <q-input
-            ref="salaryRef"
             dense
             outlined
             v-model="amount"
@@ -92,7 +84,6 @@ function inputEdit(val: boolean) {
       <q-separator />
       <form @submit.prevent="validateForm">
         <q-card-actions align="right" class="bg-white text-teal">
-          <!-- <q-btn flat label="OK" v-close-popup /> -->
           <q-btn
             type="submit"
             for="#submitForm"
diff --git a/src/modules/13_salary/components/SalaryLists/DialogMoveGroup.vue b/src/modules/13_salary/components/SalaryLists/DialogMoveGroup.vue
index b83e41eeb..0e88a09eb 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogMoveGroup.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogMoveGroup.vue
@@ -22,13 +22,17 @@ const props = defineProps({
 });
 
 const group = ref<string>("");
+const groupRef = ref<any>(null);
 const isReadonly = ref<boolean>(false); // อ่านได้อย่างเดียว
 const mixin = useCounterMixin();
 const { dialogConfirm, success, messageError, showLoader, hideLoader } = mixin;
 
 /*** ฟังก์ชั่นสำหรับ validate ฟอร์ม */
 function validateForm() {
-  onSubmit();
+  groupRef.value.validate();
+  if (groupRef.value.validate()) {
+    onSubmit();
+  }
 }
 
 function close() {
@@ -76,7 +80,7 @@ function inputEdit(val: boolean) {
       <q-card-section class="scroll" style="max-height: 70vh">
         <div class="q-gutter-y-sm">
           <q-select
-            ref="periodRef"
+            ref="groupRef"
             :class="inputEdit(isReadonly)"
             v-model="group"
             label="กลุ่ม"
@@ -87,7 +91,7 @@ function inputEdit(val: boolean) {
             option-label="name"
             option-value="id"
             :options="store.groupOp.filter((e) => e.name !== props.group)"
-            :rules="[(val) => !!val || `${'กรุณาเลือกรอบการขึ้นเงินเดือน'}`]"
+            :rules="[(val) => !!val || `${'กรุณากลุ่ม'}`]"
             lazy-rules
             hide-bottom-space
           />
diff --git a/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue b/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
index 25698e626..792d63edc 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
@@ -14,6 +14,7 @@ const store = useSalaryListSDataStore();
 const modal = defineModel<boolean>("modal", { required: true });
 const profileId = defineModel<string>("profileId", { required: true });
 const type = ref<string>("");
+const typeRef = ref<any>(null);
 const isReadonly = ref<boolean>(false); // อ่านได้อย่างเดียว
 const mixin = useCounterMixin();
 const { dialogConfirm, success, messageError, showLoader, hideLoader } = mixin;
@@ -25,14 +26,17 @@ const props = defineProps({
 });
 const typeOp = ref<DataOption[]>([
   { id: "NONE", name: "ไม่ได้เลื่อน" },
-  { id: "HAFT", name: "ครึ่งขั้น" },
-  { id: "FULL", name: "1ขั้น" },
-  { id: "FULLHAFT", name: "1.5ขั้น" },
+  { id: "HAFT", name: "0.5 ขั้น" },
+  { id: "FULL", name: "1 ขั้น" },
+  { id: "FULLHAFT", name: "1.5 ขั้น" },
 ]);
 
 /*** ฟังก์ชั่นสำหรับ validate ฟอร์ม */
 function validateForm() {
-  onSubmit();
+  typeRef.value.validate();
+  if (typeRef.value.validate()) {
+    onSubmit();
+  }
 }
 
 function close() {
@@ -80,7 +84,7 @@ function inputEdit(val: boolean) {
       <q-card-section class="scroll" style="max-height: 70vh">
         <div class="q-gutter-y-sm">
           <q-select
-            ref="periodRef"
+            ref="typeRef"
             :class="inputEdit(isReadonly)"
             v-model="type"
             label="เลื่อนขั้น"
diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue
index 895bc4c80..ed686e50b 100644
--- a/src/modules/13_salary/components/SalaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue
@@ -162,6 +162,7 @@ function changeTabType() {
 
 function updatePagination() {
   store.groupId && fetchDataPeriod(store.groupId);
+  store.groupId && fetchDataQuota(store.groupId);
 }
 
 onMounted(async () => {