From 9805a1d2c4c2c1f4ac624a5271bd92b5490ae579 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Thu, 7 Dec 2023 14:07:24 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=82?=
 =?UTF-8?q?=E0=B8=99=E0=B8=B2=E0=B8=94=E0=B8=9B=E0=B8=8F=E0=B8=B4=E0=B8=97?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=99=20=E0=B9=81=E0=B8=A5=E0=B8=B0=20validate=20?=
 =?UTF-8?q?=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=9F=E0=B8=AD=E0=B8=A3=E0=B9=8C?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=AA=E0=B8=B7=E0=B8=9A=E0=B8=AA=E0=B8=A7=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/2_InvestigateFacts/CalandarDialog.vue      | 2 +-
 .../11_discipline/components/2_InvestigateFacts/Form.vue  | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue b/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue
index d11c1ceb2..f3d8c4bdc 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/CalandarDialog.vue
@@ -345,7 +345,7 @@ function updateDateMonth(date: Date) {
 </template>
 <style scope lang="scss">
 .main-content {
-  height: 65vh;
+  height: 85vh;
 }
 
 .color-main {
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index ec614f061..a4ede68e3 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -720,7 +720,7 @@ onMounted(async () => {
                   :rules="[
                     (val) =>
                       formData.investigationDetail === 'OTHER'
-                        ? !!val || 'กรุณาเลือกจำนวนวันที่ต้องการขยาย'
+                        ? !!val || 'กรุณากรอกรายการอื่นๆ'
                         : true,
                   ]"
                   @update:model-value="changeFormData()"
@@ -796,10 +796,8 @@ onMounted(async () => {
                               map-options
                               :rules="[
                                 (val) =>
-                                  formData.investigationExtendStatus
-                                    ? !!val ||
-                                      'กรุณาเลือกจำนวนวันที่ต้องการขยาย'
-                                    : true,
+                                  (!!val && val != 0) ||
+                                  `${'กรุณาเลือกจำนวนวันที่ต้องการขยาย'}`,
                               ]"
                               option-label="name"
                               option-value="id"