From bc51350b969bf8c7ec6334651a52019c96678bdf Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 21 Jan 2025 17:18:37 +0700
Subject: [PATCH 1/2] =?UTF-8?q?SIT=20=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2>>=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=9B=E0=B8=9C=E0=B8=A5=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=9E=E0=B8=B4=E0=B8=88=E0=B8=B2=E0=B8=A3=E0=B8=93?=
 =?UTF-8?q?=E0=B8=B2=20(=E0=B8=AB=E0=B8=B2=E0=B8=81=E0=B8=82=E0=B9=89?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B9=80=E0=B8=87=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=E0=B9=84?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=88=E0=B8=A1=E0=B8=B5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/11_discipline/components/4_Result/Form.vue | 5 +++--
 src/modules/11_discipline/store/Main.ts                | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/modules/11_discipline/components/4_Result/Form.vue b/src/modules/11_discipline/components/4_Result/Form.vue
index af3e9dbba..cc95b1691 100644
--- a/src/modules/11_discipline/components/4_Result/Form.vue
+++ b/src/modules/11_discipline/components/4_Result/Form.vue
@@ -271,6 +271,7 @@ watch(
   }
 );
 </script>
+
 <template>
   <div class="row col-12 bg-white">
     <div v-if="isSave" class="col-12">
@@ -430,7 +431,7 @@ watch(
                               {{
                                 props.row.salary
                                   ? props.row.salary.toLocaleString()
-                                  : ""
+                                  : "-"
                               }}
                             </div>
                             <div v-else-if="col.name === 'profileType'">
@@ -441,7 +442,7 @@ watch(
                               }}
                             </div>
                             <div v-else>
-                              {{ col.value }}
+                              {{ col.value  ?? '-'}}
                             </div>
                           </q-td>
                         </q-tr>
diff --git a/src/modules/11_discipline/store/Main.ts b/src/modules/11_discipline/store/Main.ts
index 43cb36f98..f15b64612 100644
--- a/src/modules/11_discipline/store/Main.ts
+++ b/src/modules/11_discipline/store/Main.ts
@@ -108,7 +108,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
       headerStyle: "font-size: 14px",
       style: "font-size: 14px",
       format(val, row) {
-        return val.toLocaleString();
+        return val ?  val.toLocaleString() : '-';
       },
     },
     {

From 10bccab4b7d940ac2afae7d499f90d8b4bdcd6bf Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 21 Jan 2025 17:22:20 +0700
Subject: [PATCH 2/2] =?UTF-8?q?SIT=20=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?=
 =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=99/=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B8=88?=
 =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87>>=E0=B9=80=E0=B8=A5=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B8=88?=
 =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87=20=E0=B8=A5=E0=B8=B9=E0=B8=81?=
 =?UTF-8?q?=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=AF=20(Check=20Box=20?=
 =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82=E0=B8=84=E0=B8=B8?=
 =?UTF-8?q?=E0=B8=93=E0=B8=AA=E0=B8=A1=E0=B8=9A=E0=B8=B1=E0=B8=95=E0=B8=B4?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_salaryListsEmployee/DialogProperties.vue        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/DialogProperties.vue b/src/modules/13_salary/components/05_salaryListsEmployee/DialogProperties.vue
index 99007cfcf..5fd5e4a41 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/DialogProperties.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/DialogProperties.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref,  watch } from "vue";
+import { ref, watch } from "vue";
 import { useQuasar } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
@@ -83,10 +83,10 @@ function onSubmit() {
 watch(
   () => modal.value,
   () => {
-    isPunish.value = props.isPunish;
-    isSuspension.value = props.isSuspension;
-    isAbsent.value = props.isAbsent;
-    isLeave.value = props.isLeave;
+    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>