From fa4ff7eb1e50950caa23f30b0fe47f98ab4ee6f2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 15 Jul 2025 13:30:34 +0700
Subject: [PATCH] =?UTF-8?q?fix=20rules=20=E0=B9=81=E0=B8=AA=E0=B8=94?=
 =?UTF-8?q?=E0=B8=87=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1=E0=B8=84=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=94=E0=B9=80=E0=B8=AB=E0=B9=87=E0=B8=99=20=3D=3D>=20popup?=
 =?UTF-8?q?=20=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=84=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A1=E0=B8=84=E0=B8=B4=E0=B8=94=E0=B9=80=E0=B8=AB?=
 =?UTF-8?q?=E0=B9=87=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/PopupReason.vue                     | 6 +++++-
 .../09_leave/components/05_Leave/DetailLeavePage.vue       | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/Dialogs/PopupReason.vue b/src/components/Dialogs/PopupReason.vue
index 45f546b96..9ba658c11 100644
--- a/src/components/Dialogs/PopupReason.vue
+++ b/src/components/Dialogs/PopupReason.vue
@@ -28,6 +28,10 @@ const props = defineProps({
   textReport: {
     type: String,
   },
+  isRules: {
+    type: Boolean,
+    default: true,
+  },
 });
 watch(props, () => {
   if (modal.value === true && props.textReport == "") {
@@ -68,7 +72,7 @@ function closeModal() {
                   outlined
                   dense
                   lazy-rules
-                  :rules="[(val:string) => !!val || `กรุณากรอก${label}`]"
+                  :rules="isRules ? [(val:string) => !!val || `กรุณากรอก${label}`] : []"
                   v-model="reason"
                   :label="`${label}`"
                 />
diff --git a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
index 0387976c0..9cf589651 100644
--- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
@@ -63,6 +63,7 @@ const dialogTitle = ref<string>("อนุญาต"); // Title ของ Dialog
 const dialogLabel = ref<string>("เหตุผล"); // Label ของ Dialog
 const modalAdd = ref<boolean>(false); // เปิด Modal เพิ่มผู้บังคับบัญชา
 const typeAdd = ref<string>(""); // ประเภทการเพิ่ม เช่น COMMANDER, APPROVER
+const isRules = ref<boolean>(true); // เช็คว่ามีการกำหนดกฎของหมายความคิดเห็น
 /** Form รายละเอียดข้อมูล*/
 const formData = reactive<FormData>({
   id: "", //Id การยื่นขอลา
@@ -446,14 +447,17 @@ async function checkLeaveType(leaveTypeId: string, formData: FormData) {
 async function openModal(data: string) {
   if (data === "approve") {
     modalApprove.value = true;
+    isRules.value = false;
     dialogTitle.value = "อนุญาต";
   }
   if (data === "UnApprove") {
     modalApprove.value = true;
     dialogTitle.value = "ไม่อนุญาต";
+    isRules.value = true;
   }
   if (data === "authority") {
     modalApprove.value = true;
+    isRules.value = true;
     dialogTitle.value = "ความคิดเห็นของผู้บังคับบัญชา";
     dialogLabel.value = "ความคิดเห็น";
   }
@@ -1229,7 +1233,8 @@ onMounted(async () => {
     v-model:modal="modalApprove"
     :title="dialogTitle"
     :label="dialogLabel"
-    :savaForm="clickSave"
+    :sava-form="clickSave"
+    :is-rules="isRules"
   />
 
   <DialogAddCommander