diff --git a/src/modules/13_salary/components/SalaryLists/DialogProperties.vue b/src/modules/13_salary/components/SalaryLists/DialogProperties.vue
index 0f9f4fc36..b11de0b02 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogProperties.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogProperties.vue
@@ -37,8 +37,6 @@ const props = defineProps({
 });
 
 const type = ref<string>("");
-const typeRef = ref<any>(null);
-const isReadonly = ref<boolean>(false); // อ่านได้อย่างเดียว
 
 const isPunish = ref<boolean>(false); // มีการแก้ไขข้อมูลหรือไม่
 const isSuspension = ref<boolean>(false); // สำรองหรือไม่
@@ -100,10 +98,12 @@ function onSubmit() {
 watch(
   () => modal.value,
   () => {
-    isPunish.value = props.isPunish;
-    isSuspension.value = props.isSuspension;
-    isAbsent.value = props.isAbsent;
-    isLeave.value = props.isLeave;
+    if (modal.value) {
+      isPunish.value = props.isPunish ? props.isPunish : false;
+      isSuspension.value = props.isSuspension ? props.isSuspension : false;
+      isAbsent.value = props.isAbsent ? props.isAbsent : false;
+      isLeave.value = props.isLeave ? props.isLeave : false;
+    }
   }
 );
 </script>
@@ -117,33 +117,24 @@ watch(
       <q-card-section class="scroll" style="max-height: 70vh">
         <div class="q-gutter-y-sm column">
           <q-checkbox
-            toggle-indeterminate
             keep-color
             label="ไม่ถูกลงโทษทางวินัย"
             dense
             v-model="isPunish"
           />
           <q-checkbox
-            toggle-indeterminate
             keep-color
             label="ไม่ถูกพักราชการ"
             dense
             v-model="isSuspension"
           />
           <q-checkbox
-            toggle-indeterminate
             keep-color
             label="ไม่ขาดราชการ"
             dense
             v-model="isAbsent"
           />
-          <q-checkbox
-            toggle-indeterminate
-            keep-color
-            label="วันลาไม่เกิน"
-            dense
-            v-model="isLeave"
-          />
+          <q-checkbox keep-color label="วันลาไม่เกิน" dense v-model="isLeave" />
         </div>
       </q-card-section>
       <q-separator />