From 4e368241aa082594c3c9586c83e8c9a0aeaf8eee Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 31 Oct 2024 10:23:41 +0700
Subject: [PATCH] =?UTF-8?q?fix=20bug=20=3D>=20=E0=B8=9A=E0=B8=B1=E0=B8=99?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B6=E0=B8=81=E0=B8=9C=E0=B8=A5=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=84=E0=B8=94=E0=B9=89=E0=B8=A3=E0=B8=B1=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=9E=E0=B8=A3=E0=B8=B0=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=97?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7=E0=B9=88?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=AD=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B8=B4=E0=B8=A2=E0=B8=B2=E0=B8=A0=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=93=E0=B9=8C/=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=88?=
 =?UTF-8?q?=E0=B9=88=E0=B8=B2=E0=B8=A2=E0=B9=83=E0=B8=9A=E0=B8=81=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B1=E0=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/07_insignia/interface/index/Main.ts |  1 +
 src/modules/07_insignia/storeResult.ts          |  3 +--
 src/modules/07_insignia/views/03_ResultMain.vue | 10 ++--------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/modules/07_insignia/interface/index/Main.ts b/src/modules/07_insignia/interface/index/Main.ts
index 00d1016f2..71caa1913 100644
--- a/src/modules/07_insignia/interface/index/Main.ts
+++ b/src/modules/07_insignia/interface/index/Main.ts
@@ -109,6 +109,7 @@ interface DataRecord {
   prefix: string;
   position: string;
   status: string;
+  statusMain: string;
   dateReceive: string | Date | null;
   name: string;
   type: string;
diff --git a/src/modules/07_insignia/storeResult.ts b/src/modules/07_insignia/storeResult.ts
index 74102b045..f37b08163 100644
--- a/src/modules/07_insignia/storeResult.ts
+++ b/src/modules/07_insignia/storeResult.ts
@@ -84,8 +84,6 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
    * @param data รายชื่อข้าราชการสามัญฯ
    */
   async function fetchlistinsignia(data: ResponseRecordLists[]) {
-    console.log(data);
-
     rows.value = [];
     const alllist = await data.map((e: ResponseRecordLists) => ({
       id: e.id,
@@ -93,6 +91,7 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
       prefix: e.prefix,
       position: e.position,
       status: status(e.status) ?? "",
+      statusMain: e.status,
       dateReceive: date2Thai(e.dateReceive),
       name: e.fullName,
       type: `${e.requestInsignia} (${
diff --git a/src/modules/07_insignia/views/03_ResultMain.vue b/src/modules/07_insignia/views/03_ResultMain.vue
index 50d67b763..8678c1a7f 100644
--- a/src/modules/07_insignia/views/03_ResultMain.vue
+++ b/src/modules/07_insignia/views/03_ResultMain.vue
@@ -69,12 +69,6 @@ const dataModal = ref<DataPerson>(); //ช้อมูลที่ต้อง
 const filterRef = ref<QInput>();
 const filter = ref<string>("");
 const columns = ref<QTableProps["columns"]>([
-  // {
-  //   name: "action",
-  //   align: "left",
-  //   label: "",
-  //   field: "",
-  // },
   {
     name: "no",
     align: "left",
@@ -229,7 +223,6 @@ const visibleColumns = ref<String[]>([
   "dateReceive",
   "date",
   "employeeType",
-  " ",
   "section",
   "page",
   "number",
@@ -909,7 +902,8 @@ onMounted(() => {
                   <q-btn
                     v-if="
                       checkPermission($route)?.attrIsGet &&
-                      checkPermission($route)?.attrIsUpdate
+                      checkPermission($route)?.attrIsUpdate &&
+                      props.row.statusMain === 'DONE'
                     "
                     flat
                     round