From 1084f4bde25428d3b65f63798925bbebb8457c1a Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Tue, 25 Jul 2023 18:13:44 +0700
Subject: [PATCH] =?UTF-8?q?fix=20bug=20display=20&=20popup=20confirm=20?=
 =?UTF-8?q?=E0=B9=80=E0=B8=81=E0=B8=A9=E0=B8=B5=E0=B8=A2=E0=B8=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/06_retirement/views/Main.vue | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index 98372c02b..b5a054580 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -141,7 +141,7 @@
                   {{ props.row.Date }}
                 </q-td>
                 <q-td key="retireNumber" :props="props">
-                  {{ props.row.retireNumber }}
+                  {{ props.row.total }}
                 </q-td>
                 <!-- <q-td auto-width>
                   <q-btn
@@ -299,7 +299,7 @@ const columns2 = ref<QTableProps["columns"]>([
     align: "left",
     label: "จำนวนผู้เกษียณ",
     sortable: true,
-    field: "position",
+    field: "total",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -361,7 +361,21 @@ const rows2 = ref<FormMainProbation2[]>([
 
 const clickAdd = () => {
   //   modal.value = true;
-  router.push(`/retirement/list/${type.value}/${currentYear}`);
+  $q.dialog({
+    title: "ยืนยันการเพิ่มข้อมูลประกาศเกษียณ",
+    message: "ต้องการเพิ่มข้อมูลประกาศเกษียณใช่หรือไม่?",
+    cancel: {
+      flat: true,
+      color: "negative",
+    },
+    persistent: true,
+  })
+    .onOk(async () => {
+      router.push(`/retirement/list/${type.value}/${currentYear}`);
+    })
+    .onCancel(() => {})
+    .onDismiss(() => {});
+
 };
 const clickClose = async () => {
   modal.value = false;