From ff380aeeaa5f47d8073b9a72fc3eed8341d2ac02 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 30 May 2025 10:03:16 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=81=E0=B8=A3=E0=B8=93=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=82=E0=B8=AD=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81?=
 =?UTF-8?q?=E0=B8=96=E0=B9=89=E0=B8=B2=E0=B8=AD=E0=B8=99=E0=B8=B8=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B8=95?=
 =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B8=9A=E0=B8=B1=E0=B8=87=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B8=81=E0=B8=A3=E0=B8=AD=E0=B8=81=E0=B8=84?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B2=E0=B8=A1=E0=B9=80=E0=B8=AB=E0=B9=87=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/02_resign/ResignByid.vue             |  2 +-
 .../components/02_resign/ResignReject.vue           |  2 +-
 .../components/03_resignEmp/ResignByid.vue          |  2 +-
 .../components/03_resignEmp/ResignReject.vue        | 13 +++++--------
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/modules/06_retirement/components/02_resign/ResignByid.vue b/src/modules/06_retirement/components/02_resign/ResignByid.vue
index 43c649886..886148858 100644
--- a/src/modules/06_retirement/components/02_resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue
@@ -1642,7 +1642,7 @@ onMounted(async () => {
               dense
               outlined
               lazy-rules
-              :rules="[(val:string) => !!val || 'กรุณากรอกความคิดเห็น/เหตุผล']"
+              :rules="  !actionPass ? [(val:string) => !!val || 'กรุณากรอกความคิดเห็น/เหตุผล'] :[]"
               v-model="reasonReign"
               :label="`${'กรอกความคิดเห็น/เหตุผล'}`"
               type="textarea"
diff --git a/src/modules/06_retirement/components/02_resign/ResignReject.vue b/src/modules/06_retirement/components/02_resign/ResignReject.vue
index d032bdbf0..088739de8 100644
--- a/src/modules/06_retirement/components/02_resign/ResignReject.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignReject.vue
@@ -993,7 +993,7 @@ onMounted(async () => {
               dense
               outlined
               lazy-rules
-              :rules="[(val:string) => !!val || 'กรุณากรอกความคิดเห็น/เหตุผล']"
+              :rules="  !actionPass ? [(val:string) => !!val || 'กรุณากรอกความคิดเห็น/เหตุผล'] :[]"
               v-model="reasonReign"
               :label="`${'กรอกความคิดเห็น/เหตุผล'}`"
               type="textarea"
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
index 14c8efe3d..1388b2376 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
@@ -1608,7 +1608,7 @@ onMounted(async () => {
               dense
               outlined
               lazy-rules
-              :rules="[(val:string) => !!val || 'กรุณากรอกความคิดเห็น/เหตุผล']"
+              :rules="  !actionPass ? [(val:string) => !!val || 'กรุณากรอกความคิดเห็น/เหตุผล'] :[]"
               v-model="reasonReign"
               :label="`${'กรอกความคิดเห็น/เหตุผล'}`"
               type="textarea"
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
index d3fa8b0e2..b69707ab0 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
@@ -7,7 +7,6 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { checkPermission } from "@/utils/permissions";
 import DialogHeader from "@/components/DialogHeader.vue";
 import { useRetirementDataStore } from "@/modules/06_retirement/store/Main";
 import { useRoleWorkflowDataStore } from "@/stores/roleWorkflow";
@@ -694,6 +693,8 @@ onMounted(async () => {
         </div>
       </div>
     </q-card>
+
+    <!-- ส่งไปพิจารณา -->
     <q-card
       bordered
       class="row col-12 text-dark q-mt-sm q-pa-sm"
@@ -711,6 +712,7 @@ onMounted(async () => {
         ><q-tooltip>คลิกเพื่อส่งไปพิจารณา</q-tooltip></q-btn
       >
     </q-card>
+
     <!-- แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย -->
     <q-card bordered class="row col-12 text-dark q-mt-sm">
       <q-form
@@ -957,14 +959,9 @@ onMounted(async () => {
         </div>
       </q-form>
     </q-card>
-    <!-- <WorkFlow
-      ref="workflowRef"
-      v-model:is-check-data="isCheckData"
-      :id="id"
-      sys-name="RETIREMENT_CANCEL"
-    /> -->
   </div>
 
+  <!-- pooup อนุญาตยกเลิกการลาออก -->
   <q-dialog v-model="modal" persistent>
     <q-card style="width: 800px">
       <q-form greedy @submit.prevent @validation-success="onSubmit">
@@ -982,7 +979,7 @@ onMounted(async () => {
               dense
               outlined
               lazy-rules
-              :rules="[(val:string) => !!val || 'กรุณากรอกความคิดเห็น/เหตุผล']"
+              :rules="  !actionPass ? [(val:string) => !!val || 'กรุณากรอกความคิดเห็น/เหตุผล'] :[]"
               v-model="reasonReign"
               :label="`${'กรอกความคิดเห็น/เหตุผล'}`"
               type="textarea"