เงินเดือน กรณคนสำรอง

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"

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"