From feab1a811f0d4cadec89cfc55145e969b01d900c Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Fri, 6 Oct 2023 10:10:50 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=20?=
 =?UTF-8?q?=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B8=AB=E0=B8=99=E0=B8=B1=E0=B8=87?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B7=E0=B8=AD=E0=B9=80=E0=B8=A7=E0=B8=B5=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=99=20btn=20popup=20confirm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../06_retirement/components/resign/DetailByidDeceased.vue  | 6 +++---
 .../06_retirement/components/resign/DetailDeceased.vue      | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/modules/06_retirement/components/resign/DetailByidDeceased.vue b/src/modules/06_retirement/components/resign/DetailByidDeceased.vue
index 8c4b8f154..095ba918a 100644
--- a/src/modules/06_retirement/components/resign/DetailByidDeceased.vue
+++ b/src/modules/06_retirement/components/resign/DetailByidDeceased.vue
@@ -33,7 +33,7 @@ const next = () => props.next();
 
 const $q = useQuasar();
 const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
-const { dialogRemove, messageError, showLoader, hideLoader, success } = mixin;
+const { dialogRemove, messageError, showLoader, hideLoader, success,dialogConfirm } = mixin;
 
 const myForm = ref<QForm | null>(null);
 const filterRef = ref<QInput>();
@@ -327,7 +327,7 @@ const saveDataCopyOrder = async () => {
   if (myForm.value !== null) {
     myForm.value.validate().then(async (result: boolean) => {
       if (result) {
-        await fetchSaveCopyOrder();
+        dialogConfirm($q,() => fetchSaveCopyOrder(),'ยืนยันการส่งหนังสือเวียน','ต้องการยืนยันการส่งหนังสือเวียนหรือไม่')
       }
     });
   }
@@ -511,7 +511,7 @@ const updateData = (row: DataCopyOrder) => {
       <q-btn
         dense
         unelevated
-        label="บันทึก"
+        label="ส่งหนังสือเวียน"
         color="public"
         @click="saveDataCopyOrder"
         class="q-px-md"
diff --git a/src/modules/06_retirement/components/resign/DetailDeceased.vue b/src/modules/06_retirement/components/resign/DetailDeceased.vue
index 73d0db767..12737dadf 100644
--- a/src/modules/06_retirement/components/resign/DetailDeceased.vue
+++ b/src/modules/06_retirement/components/resign/DetailDeceased.vue
@@ -96,13 +96,12 @@ const fileDownload = async (type: string) => {
       class="q-mr-sm"
       @click="router.push(`/deceased`)"
     />
-    รายละเอียดบันทึกเวียนแจ้งการถึงแก่กรรม {{ detail.firstName }}
-    {{ detail.lastName }}
+    รายละเอียดบันทึกเวียนแจ้งการถึงแก่กรรม {{ fullName }}
   </div>
   <q-card bordered class="row col-12 text-dark">
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
       <div class="q-pl-sm text-weight-bold text-subtitle2">
-        {{ detail.firstName + "    " + detail.lastName }}
+        {{ fullName }}
       </div>
       <q-space />
       <q-btn