From cbf34695b8d9b5360830b6d1179ba5f0b459213b Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Thu, 7 Mar 2024 16:30:43 +0700
Subject: [PATCH] =?UTF-8?q?=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=E0=B8=81=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=93=E0=B8=84=E0=B8=99=E0=B8=AA=E0=B8=B3=E0=B8=A3=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/SalaryLists/DialogMoveLevel.vue     |  5 +----
 .../components/SalaryLists/TableTypeOther.vue      | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue b/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
index e8e85da65..13a558a61 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue
@@ -104,7 +104,7 @@ function onSubmit() {
 watch(
   () => modal.value,
   () => {
-    type.value = props.typeLevel;
+    type.value = props.typeLevel == 'PENDING' ? "" : props.typeLevel;
     isReserve.value = props.isReserve;
     isChange.value = false;
   }
@@ -159,9 +159,6 @@ function inputEdit(val: boolean) {
       <form @submit.prevent="validateForm">
         <q-card-actions align="right" class="bg-white text-teal">
           <!-- <q-btn flat label="OK" v-close-popup /> -->
-          isChange={{ isChange }}<br />
-          typeLevel={{ type }}<br />
-          isRe={{ isChange }}<br />
           <q-btn
             :disabled="!isChange"
             type="submit"
diff --git a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
index 8d40337aa..dec85a695 100644
--- a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
+++ b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
@@ -192,14 +192,18 @@ function onClickMovieGroup(id: string) {
   modalDialogMoveGroup.value = !modalDialogMoveGroup.value;
 }
 
+const typeLevel = ref<string>("");
+const isReserve = ref<boolean>(false);
 /**
  * function openPopup ย้ายกขั้น
  * @param id profileId
  *
  */
-function onClickMoveLevel(id: string) {
+function onClickMoveLevel(id: string, typeVal: string, isReserveVal: boolean) {
   profileId.value = id;
   modalDialogMoveLeve.value = !modalDialogMoveLeve.value;
+  typeLevel.value = typeVal;
+  isReserve.value = isReserveVal;
 }
 
 /**
@@ -387,7 +391,11 @@ watch(
                       : item.type === 'moveGroup'
                       ? onClickMovieGroup(props.row.id)
                       : item.type === 'moveLevel'
-                      ? onClickMoveLevel(props.row.id)
+                      ? onClickMoveLevel(
+                          props.row.id,
+                          props.row.type,
+                          props.row.isReserve
+                        )
                       : item.type === 'delete'
                       ? onClickDelete(props.row.id)
                       : null
@@ -444,6 +452,8 @@ watch(
     :fetchData="props.fetchDataTable"
   />
   <DialogMoveLevel
+    :typeLevel="typeLevel"
+    :isReserve="isReserve"
     v-model:modal="modalDialogMoveLeve"
     v-model:profileId="profileId"
     :fetchData="props.fetchDataTable"