From fca00067f03c125d122f515c78ee2853a960bca7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Jul 2024 10:39:23 +0700
Subject: [PATCH] fix bug

---
 src/modules/05_placement/components/AppointMent/Detail.vue | 2 +-
 src/modules/10_order/components/step/step02.vue            | 4 ++--
 src/modules/15_development/components/Record.vue           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/05_placement/components/AppointMent/Detail.vue b/src/modules/05_placement/components/AppointMent/Detail.vue
index f126e6012..29ad044ee 100644
--- a/src/modules/05_placement/components/AppointMent/Detail.vue
+++ b/src/modules/05_placement/components/AppointMent/Detail.vue
@@ -160,7 +160,7 @@ onMounted(async () => {
   </div>
   <CardProfile :data="dataProfile as DataProfile" />
 
-  <q-card bordered class="row col-12 text-dark q-mt-sm">
+  <q-card bordered class="text-dark q-mt-sm">
     <q-form
       greedy
       @submit.prevent
diff --git a/src/modules/10_order/components/step/step02.vue b/src/modules/10_order/components/step/step02.vue
index 2bc53f70f..644c31389 100644
--- a/src/modules/10_order/components/step/step02.vue
+++ b/src/modules/10_order/components/step/step02.vue
@@ -661,7 +661,7 @@ const pagination = ref({
                     dense
                     hide-bottom-space
                     :label="`${'เงินประจำตำแหน่ง'}`"
-                    :rules="[(val:number) => !!val || `${'กรุณากรอกเงินประจำตำแหน่ง'}`]"
+                    :rules="modalData.positionSalaryAmount !== 0 ?[(val:number) => !!val ||  `${'กรุณากรอกเงินประจำตำแหน่ง'}`] : []"
                     lazy-rules
                     class="inputgreen"
                     mask="###,###,###,###"
@@ -683,7 +683,7 @@ const pagination = ref({
                     dense
                     hide-bottom-space
                     :label="`${'เงินค่าตอบแทนรายเดือน'}`"
-                    :rules="[(val:number) => !!val || `${'กรุณากรอกเงินค่าตอบแทนรายเดือน'}`]"
+                    :rules="modalData.monthSalaryAmount !== 0 ?[(val:number) => !!val || `${'กรุณากรอกเงินค่าตอบแทนรายเดือน'}`]:[]"
                     lazy-rules
                     class="inputgreen"
                     mask="###,###,###,###"
diff --git a/src/modules/15_development/components/Record.vue b/src/modules/15_development/components/Record.vue
index 53f02fba0..2bfd1cc2d 100644
--- a/src/modules/15_development/components/Record.vue
+++ b/src/modules/15_development/components/Record.vue
@@ -381,7 +381,7 @@ onMounted(() => {
           <div v-if="col.name == 'fullName'">
             {{ props.row.prefix ? props.row.prefix:''  }}{{ props.row.firstName ? props.row.firstName:''  }} {{ props.row.lastName ? props.row.lastName:''  }}
           </div>
-          <div v-else>{{ col.value ? col.value : "-" }}</div>
+          <div v-else  class="table_ellipsis2">{{ col.value ? col.value : "-" }}</div>
         </q-td>
       </q-tr>
     </template>