From 959537f1c7c69579a47dfb0c2e9cc9df5d04ca25 Mon Sep 17 00:00:00 2001
From: oat <oatkub402@gmail.com>
Date: Fri, 2 Feb 2024 15:01:26 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=9A=E0=B8=B8=E0=B8=84=E0=B8=84=E0=B8=A5:=20?=
 =?UTF-8?q?=E0=B8=97=E0=B8=B3interface=E0=B9=83=E0=B8=AB=E0=B8=A1=E0=B9=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/personal/01ListPrefix.vue      | 58 +++++++--------
 .../components/personal/02ListRank.vue        | 57 +++++++--------
 .../components/personal/03ListBloodGroup.vue  | 57 +++++++--------
 .../components/personal/04ListGender.vue      | 57 +++++++--------
 .../components/personal/05ListReligion.vue    | 71 +++++++++----------
 .../personal/06ListRelationship.vue           | 71 +++++++++----------
 .../components/personal/DialogForm.vue        |  2 +-
 .../interface/response/personal/personal.ts   | 27 +++++++
 .../01_metadataNew/stores/personalStore.ts    |  2 +-
 9 files changed, 193 insertions(+), 209 deletions(-)
 create mode 100644 src/modules/01_metadataNew/interface/response/personal/personal.ts

diff --git a/src/modules/01_metadataNew/components/personal/01ListPrefix.vue b/src/modules/01_metadataNew/components/personal/01ListPrefix.vue
index 7be892d64..26dec7b35 100644
--- a/src/modules/01_metadataNew/components/personal/01ListPrefix.vue
+++ b/src/modules/01_metadataNew/components/personal/01ListPrefix.vue
@@ -64,7 +64,6 @@ const $q = useQuasar();
 const filterKeyword = ref<string>("");
 const dialog = ref<boolean>(false);
 const prefix = ref<string>("");
-const prefixRef = ref<any>(null);
 const dialogStatus = ref<string>("");
 const personalName = ref<string>("คำนำหน้าชื่อ");
 const visibleColumns = ref<string[]>([
@@ -74,35 +73,32 @@ const visibleColumns = ref<string[]>([
   "lastUpdateFullName",
 ]);
 
-function fetchData() {
-  const data = [
-    {
-      id: "1",
-      name: "ว่าที่ร้อยตรี",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "สาวิตรี ศรีสมัย",
-    },
-    {
-      id: "2",
-      name: "นางสาว",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "System Administrator",
-    },
-    {
-      id: "3",
-      name: "นาย",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
-    },
-  ];
-  store.fetchData(data);
-}
+const data = [
+  {
+    id: "1",
+    name: "ว่าที่ร้อยตรี",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "สาวิตรี ศรีสมัย",
+  },
+  {
+    id: "2",
+    name: "นางสาว",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "System Administrator",
+  },
+  {
+    id: "3",
+    name: "นาย",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
+  },
+];
 
 onMounted(async () => {
-  fetchData();
+  store.fetchData(data);
 });
 </script>
 
@@ -164,11 +160,7 @@ onMounted(async () => {
       </q-tr>
     </template>
     <template v-slot:body="props">
-      <q-tr
-        :props="props"
-        class="cursor-pointer"
-        @click.stop="onclickDetail(props.row.id)"
-      >
+      <q-tr :props="props" class="cursor-pointer">
         <q-td v-for="col in props.cols" :key="col.id">
           <div>
             {{ col.value }}
diff --git a/src/modules/01_metadataNew/components/personal/02ListRank.vue b/src/modules/01_metadataNew/components/personal/02ListRank.vue
index df9d09915..cea8e5829 100644
--- a/src/modules/01_metadataNew/components/personal/02ListRank.vue
+++ b/src/modules/01_metadataNew/components/personal/02ListRank.vue
@@ -74,35 +74,32 @@ const visibleColumns = ref<string[]>([
   "lastUpdateFullName",
 ]);
 
-function fetchData() {
-  const data = [
-    {
-      id: "1",
-      name: "ยศ 1",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "สาวิตรี ศรีสมัย",
-    },
-    {
-      id: "2",
-      name: "ยศ 2",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "System Administrator",
-    },
-    {
-      id: "3",
-      name: "ยศ 3",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
-    },
-  ];
-  store.fetchData(data);
-}
+const data = [
+  {
+    id: "1",
+    name: "ยศ 1",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "สาวิตรี ศรีสมัย",
+  },
+  {
+    id: "2",
+    name: "ยศ 2",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "System Administrator",
+  },
+  {
+    id: "3",
+    name: "ยศ 3",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
+  },
+];
 
 onMounted(async () => {
-  fetchData();
+  store.fetchData(data);
 });
 </script>
 
@@ -164,11 +161,7 @@ onMounted(async () => {
       </q-tr>
     </template>
     <template v-slot:body="props">
-      <q-tr
-        :props="props"
-        class="cursor-pointer"
-        @click.stop="onclickDetail(props.row.id)"
-      >
+      <q-tr :props="props" class="cursor-pointer">
         <q-td v-for="col in props.cols" :key="col.id">
           <div>
             {{ col.value }}
diff --git a/src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue b/src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue
index d100c6d26..2c17ee9eb 100644
--- a/src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue
+++ b/src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue
@@ -74,35 +74,32 @@ const visibleColumns = ref<string[]>([
   "lastUpdateFullName",
 ]);
 
-function fetchData() {
-  const data = [
-    {
-      id: "1",
-      name: "A",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "สาวิตรี ศรีสมัย",
-    },
-    {
-      id: "2",
-      name: "AB",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "System Administrator",
-    },
-    {
-      id: "3",
-      name: "O",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
-    },
-  ];
-  store.fetchData(data);
-}
+const data = [
+  {
+    id: "1",
+    name: "A",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "สาวิตรี ศรีสมัย",
+  },
+  {
+    id: "2",
+    name: "AB",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "System Administrator",
+  },
+  {
+    id: "3",
+    name: "O",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
+  },
+];
 
 onMounted(async () => {
-  fetchData();
+  store.fetchData(data);
 });
 </script>
 
@@ -164,11 +161,7 @@ onMounted(async () => {
       </q-tr>
     </template>
     <template v-slot:body="props">
-      <q-tr
-        :props="props"
-        class="cursor-pointer"
-        @click.stop="onclickDetail(props.row.id)"
-      >
+      <q-tr :props="props" class="cursor-pointer">
         <q-td v-for="col in props.cols" :key="col.id">
           <div>
             {{ col.value }}
diff --git a/src/modules/01_metadataNew/components/personal/04ListGender.vue b/src/modules/01_metadataNew/components/personal/04ListGender.vue
index 915f14c2a..ebb9e39b5 100644
--- a/src/modules/01_metadataNew/components/personal/04ListGender.vue
+++ b/src/modules/01_metadataNew/components/personal/04ListGender.vue
@@ -74,35 +74,32 @@ const visibleColumns = ref<string[]>([
   "lastUpdateFullName",
 ]);
 
-function fetchData() {
-  const data = [
-    {
-      id: "1",
-      name: "ชาย",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "สาวิตรี ศรีสมัย",
-    },
-    {
-      id: "2",
-      name: "หญิง",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "System Administrator",
-    },
-    {
-      id: "3",
-      name: "เพศทางเลือก",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
-    },
-  ];
-  store.fetchData(data);
-}
+const data = [
+  {
+    id: "1",
+    name: "ชาย",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "สาวิตรี ศรีสมัย",
+  },
+  {
+    id: "2",
+    name: "หญิง",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "System Administrator",
+  },
+  {
+    id: "3",
+    name: "เพศทางเลือก",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
+  },
+];
 
 onMounted(async () => {
-  fetchData();
+  store.fetchData(data);
 });
 </script>
 
@@ -164,11 +161,7 @@ onMounted(async () => {
       </q-tr>
     </template>
     <template v-slot:body="props">
-      <q-tr
-        :props="props"
-        class="cursor-pointer"
-        @click.stop="onclickDetail(props.row.id)"
-      >
+      <q-tr :props="props" class="cursor-pointer">
         <q-td v-for="col in props.cols" :key="col.id">
           <div>
             {{ col.value }}
diff --git a/src/modules/01_metadataNew/components/personal/05ListReligion.vue b/src/modules/01_metadataNew/components/personal/05ListReligion.vue
index cf79f1bb8..ebfae39df 100644
--- a/src/modules/01_metadataNew/components/personal/05ListReligion.vue
+++ b/src/modules/01_metadataNew/components/personal/05ListReligion.vue
@@ -74,42 +74,39 @@ const visibleColumns = ref<string[]>([
   "lastUpdateFullName",
 ]);
 
-function fetchData() {
-  const data = [
-    {
-      id: "1",
-      name: "อิสลาม",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "สาวิตรี ศรีสมัย",
-    },
-    {
-      id: "2",
-      name: "พุทธ",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "System Administrator",
-    },
-    {
-      id: "3",
-      name: "ขงจื้อ",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
-    },
-    {
-      id: "4",
-      name: "คริสต์",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
-    },
-  ];
-  store.fetchData(data);
-}
+const data = [
+  {
+    id: "1",
+    name: "อิสลาม",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "สาวิตรี ศรีสมัย",
+  },
+  {
+    id: "2",
+    name: "พุทธ",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "System Administrator",
+  },
+  {
+    id: "3",
+    name: "ขงจื้อ",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
+  },
+  {
+    id: "4",
+    name: "คริสต์",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
+  },
+];
 
 onMounted(async () => {
-  fetchData();
+  store.fetchData(data);
 });
 </script>
 
@@ -171,11 +168,7 @@ onMounted(async () => {
       </q-tr>
     </template>
     <template v-slot:body="props">
-      <q-tr
-        :props="props"
-        class="cursor-pointer"
-        @click.stop="onclickDetail(props.row.id)"
-      >
+      <q-tr :props="props" class="cursor-pointer">
         <q-td v-for="col in props.cols" :key="col.id">
           <div>
             {{ col.value }}
diff --git a/src/modules/01_metadataNew/components/personal/06ListRelationship.vue b/src/modules/01_metadataNew/components/personal/06ListRelationship.vue
index 78e0e2201..2e38c6033 100644
--- a/src/modules/01_metadataNew/components/personal/06ListRelationship.vue
+++ b/src/modules/01_metadataNew/components/personal/06ListRelationship.vue
@@ -74,42 +74,39 @@ const visibleColumns = ref<string[]>([
   "lastUpdateFullName",
 ]);
 
-function fetchData() {
-  const data = [
-    {
-      id: "1",
-      name: "เคยสมรสแต่ไม่ทราบสถานภาพสมรส",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "สาวิตรี ศรีสมัย",
-    },
-    {
-      id: "2",
-      name: "สมรส",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "System Administrator",
-    },
-    {
-      id: "3",
-      name: "แยกกันอยู่",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
-    },
-    {
-      id: "4",
-      name: "โสด",
-      createdAt: new Date(),
-      lastUpdatedAt: new Date(),
-      lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
-    },
-  ];
-  store.fetchData(data);
-}
+const data = [
+  {
+    id: "1",
+    name: "เคยสมรสแต่ไม่ทราบสถานภาพสมรส",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "สาวิตรี ศรีสมัย",
+  },
+  {
+    id: "2",
+    name: "สมรส",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "System Administrator",
+  },
+  {
+    id: "3",
+    name: "แยกกันอยู่",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
+  },
+  {
+    id: "4",
+    name: "โสด",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
+  },
+];
 
 onMounted(async () => {
-  fetchData();
+  store.fetchData(data);
 });
 </script>
 
@@ -171,11 +168,7 @@ onMounted(async () => {
       </q-tr>
     </template>
     <template v-slot:body="props">
-      <q-tr
-        :props="props"
-        class="cursor-pointer"
-        @click.stop="onclickDetail(props.row.id)"
-      >
+      <q-tr :props="props" class="cursor-pointer">
         <q-td v-for="col in props.cols" :key="col.id">
           <div>
             {{ col.value }}
diff --git a/src/modules/01_metadataNew/components/personal/DialogForm.vue b/src/modules/01_metadataNew/components/personal/DialogForm.vue
index 370429407..2c3f5251f 100644
--- a/src/modules/01_metadataNew/components/personal/DialogForm.vue
+++ b/src/modules/01_metadataNew/components/personal/DialogForm.vue
@@ -6,7 +6,7 @@ import { useQuasar } from "quasar";
 
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { dialogRemove, dialogConfirm } = mixin;
+const { dialogConfirm } = mixin;
 
 const dataRef = ref<any>(null);
 const data = defineModel<string>("data", {
diff --git a/src/modules/01_metadataNew/interface/response/personal/personal.ts b/src/modules/01_metadataNew/interface/response/personal/personal.ts
new file mode 100644
index 000000000..3da7540a2
--- /dev/null
+++ b/src/modules/01_metadataNew/interface/response/personal/personal.ts
@@ -0,0 +1,27 @@
+interface DataResponse {
+  createdAt: Date;
+  id: string;
+  lastUpdateFullName: String;
+  lastUpdatedAt: Date;
+  prefix?: string;
+  rank?: string;
+  bloodgroup?: string;
+  gender?: string;
+  religion?: string;
+  relationship?: string;
+}
+
+interface DataRow {
+  createdAt: string | null;
+  id: string;
+  lastUpdateFullName: String;
+  lastUpdatedAt: string | null;
+  prefix?: string;
+  rank?: string;
+  bloodgroup?: string;
+  gender?: string;
+  religion?: string;
+  relationship?: string;
+}
+
+export type { DataResponse, DataRow };
diff --git a/src/modules/01_metadataNew/stores/personalStore.ts b/src/modules/01_metadataNew/stores/personalStore.ts
index 43aef4bdc..1237aa021 100644
--- a/src/modules/01_metadataNew/stores/personalStore.ts
+++ b/src/modules/01_metadataNew/stores/personalStore.ts
@@ -3,7 +3,7 @@ import { ref } from "vue";
 import type {
   DataResponse,
   DataRow,
-} from "../interface/response/insignia/Insignia";
+} from "../interface/response/personal/personal";
 import { useCounterMixin } from "@/stores/mixin";
 
 const { date2Thai } = useCounterMixin();