From 3e42ecbcb6521f5a2e26a648afc4e0d023bc7c2c Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 27 Sep 2023 16:58:49 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=88?=
 =?UTF-8?q?=E0=B9=89=E0=B8=87=E0=B9=80=E0=B8=95=E0=B8=B7=E0=B9=88=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=99=20=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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../07_insignia/components/2_Manage/Tab1.vue  | 47 +++++++++++--------
 src/modules/07_insignia/store.ts              |  9 +++-
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index eb88cffc5..267a74fb4 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -42,19 +42,7 @@ const dialogDesc = ref<string>("");
 
 // แจ้งเตือน
 const dialogWarn = ref<boolean>(false);
-const checkboxData = ref<any>([
-  { id: 1, name: "มีโทษทางวินัย", val: true },
-  {
-    id: 2,
-    name: "ไม่ได้เลื่อนเงินเดือน/ไม่ได้เลื่อนขั้น เนื่องจากลาเกิน",
-    val: false,
-  },
-  {
-    id: 3,
-    name: "ผลการประเมินการปฏิบัติราชการในรอบ 5 ปี ต่ำกว่าระดับดี (น้อยกว่าร้อยละ 70)",
-    val: false,
-  },
-]);
+const checkboxData = ref<any>([]);
 
 const organizationOptions = ref<any>([{ id: "1", name: "ทั้งหมด" }]);
 const visibleColumns = ref<string[]>([
@@ -641,7 +629,24 @@ const clickShowreson = (name: string, requestNote: string) => {
 const clickCloseReson = () => {
   dialogNote.value = false;
 };
-const clickShowWarn = () => {
+const clickShowWarn = (
+  markDiscipline: boolean,
+  markLeave: boolean,
+  markRate: boolean
+) => {
+  checkboxData.value = [
+    { id: 1, name: "มีโทษทางวินัย", val: markDiscipline },
+    {
+      id: 2,
+      name: "ไม่ได้เลื่อนเงินเดือน/ไม่ได้เลื่อนขั้น เนื่องจากลาเกิน",
+      val: markLeave,
+    },
+    {
+      id: 3,
+      name: "ผลการประเมินการปฏิบัติราชการในรอบ 5 ปี ต่ำกว่าระดับดี (น้อยกว่าร้อยละ 70)",
+      val: markRate,
+    },
+  ];
   dialogWarn.value = true;
 };
 </script>
@@ -805,7 +810,6 @@ const clickShowWarn = () => {
                 <span class="text-weight-medium">{{ col.label }}</span>
               </q-th>
               <q-th></q-th>
-
               <q-th
                 auto-width
                 v-if="
@@ -870,20 +874,26 @@ const clickShowWarn = () => {
                   <q-tooltip>หมายเหตุ</q-tooltip>
                 </q-btn>
               </q-td>
-              <q-td key="warn" class="text-center">
+              <q-td key="warn" class="text-center" v-if="props.row.statusMark">
                 <q-btn
-                  v-if="props.rowIndex == 1"
                   icon="mdi-information-outline"
                   size="12px"
                   color="red"
                   flat
                   round
                   dense
-                  @click.stop="clickShowWarn"
+                  @click.stop="
+                    clickShowWarn(
+                      props.row.markDiscipline,
+                      props.row.markLeave,
+                      props.row.markRate
+                    )
+                  "
                 >
                   <q-tooltip>แจ้งเตือน</q-tooltip></q-btn
                 >
               </q-td>
+              <q-td v-else auto-width></q-td>
 
               <q-td
                 v-close-popup
@@ -996,7 +1006,6 @@ const clickShowWarn = () => {
       </div>
     </div>
   </div>
-
   <!-- add -->
   <q-dialog v-model="modalAdd">
     <q-card style="width: 800px; max-width: 80vw">
diff --git a/src/modules/07_insignia/store.ts b/src/modules/07_insignia/store.ts
index da03624e6..19cb607f8 100644
--- a/src/modules/07_insignia/store.ts
+++ b/src/modules/07_insignia/store.ts
@@ -55,8 +55,12 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
         dateSend: date2Thai(e.requestDate),
         requestNote: e.requestNote,
         employeeType: profileType(e.profileType),
-        reason: e.reason
-
+        reason: e.reason,
+        markDiscipline: e.markDiscipline,
+        markLeave: e.markLeave,
+        markRate: e.markRate,
+        isApprove: e.isApprove,
+        statusMark: e.markDiscipline === true || e.markLeave === true || e.markRate === true ? true : false
       }));
       rows.value = await datalist;
       listinsignia.value = await datalist;
@@ -146,6 +150,7 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
     }
   }
 
+
   return {
     roundId,
     optionRound,