From c21a95f486604eeaea467ac433a68f8b7832e4a3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 7 Aug 2023 13:17:59 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20retirement?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/06_retirement/api.retirement.ts                |  2 +-
 .../components/ListRetirement/TableList.vue            |  9 +++++----
 src/modules/06_retirement/views/Main.vue               | 10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts
index 6f9b42c5a..698f2cb82 100644
--- a/src/api/06_retirement/api.retirement.ts
+++ b/src/api/06_retirement/api.retirement.ts
@@ -4,7 +4,7 @@ const retirement = `${env.API_URI}/retirement`
 
 export default {
     profile: (type: string, year: string) => `${retirement}/profile/${type}/${year}`,
-    // profileRetire: (retireProfileId: string) => `${retirement}/profile/${retireProfileId}`,
+    profileRetire: (retireProfileId: string) => `${retirement}/profile/${retireProfileId}`,
     listRetire: (retireId: string) => `${retirement}/${retireId}`,
     createnote: () => `${retirement}/edit`,
     removeProfile: () => `${retirement}/remove`,
diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index 740e7ad9e..f8c7f6949 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -463,6 +463,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
               :props="props"
               class="cursor-pointer"
               :style="props.row.profileId === profileId && 'color: #26a69a;'"
+              @click.stop="router.push(`/registry/${props.row.profileId}`)"
             >
               <q-td key="order" :props="props">{{ props.row.order }} </q-td>
               <!-- <q-td key="fixname" :props="props">{{ props.row.fixname }}</q-td> -->
@@ -511,7 +512,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
                 >
                   <q-tooltip>โน้ต</q-tooltip></q-btn
                 > -->
-                <q-btn
+                <!-- <q-btn
                   flat
                   round
                   color="blue"
@@ -520,7 +521,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
                   @click.stop="router.push(`/registry/${props.row.profileId}`)"
                 >
                   <q-tooltip>ดูข้อมูลทะเบียนประวัติ</q-tooltip>
-                </q-btn>
+                </q-btn> -->
               </q-td>
               <q-td auto-width v-if="typeReport === 'EDIT' || round === 1">
                 <q-btn
@@ -533,7 +534,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
                     (modalNote = true),
                       (note = props.row.reason),
                       (action = 'edit'),
-                      (retireProfileId = props.row.profileId)
+                      (retireProfileId = props.row.id)
                   "
                 >
                   <q-tooltip>กรอกเหตุผล</q-tooltip>
@@ -550,7 +551,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
                     (modalNote = true),
                       (action = 'delete'),
                       (note = props.row.remove),
-                      (retireProfileId = props.row.profileId)
+                      (retireProfileId = props.row.id)
                   "
                   ><q-tooltip>ลบข้อมูล</q-tooltip></q-btn
                 >
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index 5f5a24245..304a9bb3a 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -125,7 +125,7 @@
                 <q-th v-for="col in props.cols" :key="col.name" :props="props">
                   <span class="text-weight-medium">{{ col.label }}</span>
                 </q-th>
-                <q-th auto-width />
+                <!-- <q-th auto-width /> -->
               </q-tr>
             </template>
             <template v-slot:body="props">
@@ -472,12 +472,12 @@ const clickAdd = () => {
       })
       .onCancel(() => {})
       .onDismiss(() => {});
+  } else {
+    modal.value = true;
+    action.value = "";
+    radio.value = "";
   }
 
-  modal.value = true;
-  action.value = "";
-  radio.value = "";
-
   // $q.dialog({
   //   title: "เพิ่มประกาศ",
   //   message: "เลือกประกาศที่ต้องการเพิ่มข้อมูล",