From c1341b280bf440d7a9de29650f14923d6f705f52 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Tue, 18 Jun 2024 15:00:59 +0700
Subject: [PATCH] no message

---
 src/components/Dialogs/AddPersonal.vue                    | 4 ++--
 src/modules/10_order/components/step/step01.vue           | 2 +-
 src/modules/11_discipline/components/1_Complaint/Form.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue
index 2f2a0903e..88f37ebd6 100644
--- a/src/components/Dialogs/AddPersonal.vue
+++ b/src/components/Dialogs/AddPersonal.vue
@@ -154,7 +154,7 @@ async function getSearch() {
         posNo: e.posNo ?? "-",
         position: e.position ?? "-",
         positionLevel: e.positionLevelName ?? "-",
-        salary: e.salary ?? "-",
+        salary: e.salary ?? "",
         organization: e.organization ?? "-",
         phone: e.phone ?? "-",
         email: e.email ?? "-",
@@ -355,7 +355,7 @@ watch(
                     {{ props.prefix }}
                   </div>
                   <div v-else-if="col.name === 'salary'">
-                    {{ props.row.salary.toLocaleString() }}
+                    {{ props.row.salary ? props.row.salary.toLocaleString():'-' }}
                   </div>
                   <div v-else>
                     {{ col.value }}
diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue
index e10aa67f7..cf8cdb9d5 100644
--- a/src/modules/10_order/components/step/step01.vue
+++ b/src/modules/10_order/components/step/step01.vue
@@ -815,7 +815,7 @@ const getClass = (val: boolean) => {
 <template>
   <q-card>
     <q-form greedy @submit.prevent @validation-success="onSubmit">
-      <q-card-section style="max-height: 50vh">
+      <q-card-section>
         <!-- Main -->
         <div class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md">
           <div class="col-xs-12 col-md-6">
diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue
index 92afa4ca3..cb64d3162 100644
--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@@ -574,7 +574,7 @@ onMounted(() => {
                               {{ props.row.organization }}
                             </div>
                             <div v-else-if="col.name === 'salary'">
-                              {{ props.row.salary.toLocaleString() }}
+                              {{ props.row.salary ? props.row.salary.toLocaleString():'-' }}
                             </div>
                             <div v-else>
                               {{ col.value }}