From 14da9479534ce520e9b0fa020748a292b2ff04d2 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 22 Jul 2025 15:00:01 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=AB=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A7=20popup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/02_resign/DialogSendToCommand.vue           | 6 +++++-
 src/modules/06_retirement/components/02_resign/Table.vue   | 3 ++-
 .../components/03_resignEmp/DialogSendToCommand.vue        | 6 +++++-
 .../06_retirement/components/03_resignEmp/Table.vue        | 7 ++++++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue b/src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue
index 29e5d156f..7f4f92fee 100644
--- a/src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue
@@ -44,6 +44,7 @@ const props = defineProps({
   fecthList: { type: Function, requreid: true },
   rows: { type: Array as PropType<ResponseItems[]>, requreid: true },
   mainTabs: { type: String, requreid: true },
+  cancel: { type: Boolean, default: false },
 });
 
 //Table
@@ -235,7 +236,10 @@ watch(
 <template>
   <q-dialog v-model="props.modal" persistent>
     <q-card style="min-width: 80%">
-      <DialogHeader tittle="ส่งไปออกคำสั่งลาออก" :close="closeModal" />
+      <DialogHeader
+        :tittle="`ส่งไปออกคำสั่ง${cancel ? 'ยกเลิกการ' : ''}ลาออก`"
+        :close="closeModal"
+      />
       <q-separator />
       <q-card-section>
         <div class="row col-12 q-col-gutter-sm">
diff --git a/src/modules/06_retirement/components/02_resign/Table.vue b/src/modules/06_retirement/components/02_resign/Table.vue
index f7ce244ae..b5769dc33 100644
--- a/src/modules/06_retirement/components/02_resign/Table.vue
+++ b/src/modules/06_retirement/components/02_resign/Table.vue
@@ -308,7 +308,7 @@ onMounted(async () => {
             color="primary"
             icon="mdi-account-arrow-right"
           >
-            <q-tooltip>ส่งไปออกคำสั่งลาออก</q-tooltip>
+            <q-tooltip>{{ `ส่งไปออกคำสั่ง${stroeResign.mainTabs == '2'?"ยกเลิกการ":''}ลาออก` }}</q-tooltip>
           </q-btn>
         </div>
         <q-space />
@@ -432,6 +432,7 @@ onMounted(async () => {
     :rows="rowsSendToCommand"
     :fecth-list="fecthlist"
     :main-tabs="stroeResign.mainTabs"
+    :cancel="stroeResign.mainTabs == '2' ? true : false"
   />
 </template>
 <style scoped lang="scss"></style>
diff --git a/src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue b/src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue
index 1c3e52cef..4d01c4336 100644
--- a/src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue
@@ -42,6 +42,7 @@ const props = defineProps({
   fecthList: { type: Function, requreid: true },
   rows: { type: Array as PropType<ResponseItems[]>, requreid: true },
   mainTabs: { type: String, requreid: true },
+  cancel: { type: Boolean, default: false },
 });
 
 const filterKeyword = defineModel<string>("filterKeyword", { required: true });
@@ -210,7 +211,10 @@ watch(
 <template>
   <q-dialog v-model="props.modal" persistent>
     <q-card style="min-width: 80%">
-      <DialogHeader tittle="ส่งไปออกคำสั่งลาออก" :close="closeModal" />
+      <DialogHeader
+        :tittle="`ส่งไปออกคำสั่ง${props.cancel ? 'ยกเลิกการ' : ''}ลาออก`"
+        :close="closeModal"
+      />
       <q-separator />
       <q-card-section>
         <div class="row col-12 q-col-gutter-sm">
diff --git a/src/modules/06_retirement/components/03_resignEmp/Table.vue b/src/modules/06_retirement/components/03_resignEmp/Table.vue
index 0b9c8db2f..89a181576 100644
--- a/src/modules/06_retirement/components/03_resignEmp/Table.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/Table.vue
@@ -304,7 +304,11 @@ onMounted(async () => {
             color="primary"
             icon="mdi-account-arrow-right"
           >
-            <q-tooltip>ส่งไปออกคำสั่งลาออก</q-tooltip>
+            <q-tooltip>{{
+              `ส่งไปออกคำสั่ง${
+                stroeResign.mainTabsEMP == "2" ? "ยกเลิกการ" : ""
+              }ลาออก`
+            }}</q-tooltip>
           </q-btn>
         </div>
         <q-space />
@@ -417,6 +421,7 @@ onMounted(async () => {
     :rows="rowsSendToCommand"
     :fecth-list="fecthlist"
     :main-tabs="stroeResign.mainTabsEMP"
+    :cancel="stroeResign.mainTabsEMP == '2' ? true : false"
   />
 </template>
 <style scoped lang="scss"></style>