From 8b9228a308cec3db10c34a1e3f904cc8ea175339 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Thu, 2 May 2024 16:36:46 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=82=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Receive/receiveDetail2.vue     | 73 +++----------------
 .../interface/response/Receive.ts             | 31 ++++++++
 2 files changed, 40 insertions(+), 64 deletions(-)

diff --git a/src/modules/05_placement/components/Receive/receiveDetail2.vue b/src/modules/05_placement/components/Receive/receiveDetail2.vue
index e328d67b6..24a5cd8fc 100644
--- a/src/modules/05_placement/components/Receive/receiveDetail2.vue
+++ b/src/modules/05_placement/components/Receive/receiveDetail2.vue
@@ -6,7 +6,10 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useProfileDataStore } from "@/modules/08_registryEmployee/store";
 import CurrencyInput from "@/components/CurruncyInput.vue";
 import type { QTableProps, QForm } from "quasar";
-import type { ResponseTitle } from "@/modules/05_placement/interface/response/Receive";
+import type {
+  ResponseTitle,
+  DataProfile,
+} from "@/modules/05_placement/interface/response/Receive";
 import type { InformationOps } from "@/modules/04_registry/interface/index/Main";
 import type {
   Information,
@@ -19,9 +22,9 @@ import { defaultInformation } from "@/modules/04_registry/components/profileType
 
 import http from "@/plugins/http";
 import config from "@/app.config";
-import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
-const modalPersonal = ref<boolean>(false);
+import CardProfile from "@/components/CardProfile.vue";
 
+const dataProfile = ref<DataProfile>();
 const $q = useQuasar();
 const route = useRoute();
 const router = useRouter();
@@ -196,6 +199,7 @@ const getData = async () => {
     .get(config.API.receiveDataId(paramsId.toString()))
     .then(async (res: any) => {
       const data = res.data.result;
+      dataProfile.value = res.data.result as unknown as DataProfile;
       let list: docList[] = [];
       if (data.docs.length > 0) {
         data.docs.map((doc: docList) => {
@@ -467,10 +471,6 @@ const getClass = (val: boolean) => {
   };
 };
 
-function onclickViewinfo() {
-  modalPersonal.value = true;
-}
-
 onMounted(async () => {
   await fetchPerson();
   await getData();
@@ -491,56 +491,8 @@ onMounted(async () => {
     />
     รายละเอียดการรับโอนของ {{ title.fullname }}
   </div>
-  <q-card bordered class="row col-12 text-dark">
-    <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
-      <div class="q-pl-sm text-weight-bold text-subtitle2">
-        {{ title.fullname }}
-      </div>
-      <q-space />
-      <q-btn
-        outline
-        color="blue"
-        dense
-        icon-right="mdi-open-in-new"
-        class="q-px-sm"
-        label="ดูข้อมูลทะเบียนประวัติ"
-        @click="onclickViewinfo()"
-      />
-    </div>
-    <div class="col-12"><q-separator /></div>
-    <div class="row col-12 q-pa-md">
-      <div class="col-12 row bg-white q-col-gutter-md">
-        <div class="col-xs-3 col-sm-2 col-md-1 row">
-          <q-img :src="avatar" v-if="avatar !== ''" />
-          <q-img v-else src="@/assets/avatar_user.jpg" />
-        </div>
-        <div class="col-xs-6 col-sm-3 row items-center">
-          <div class="col-12 q-pl-md">
-            <div class="col-12 text-top">ตำแหน่งในสายงาน</div>
-            <div class="col-12 text-detail">
-              {{ title.positionTypeOld }}
-            </div>
-          </div>
-        </div>
-        <div class="col-xs-6 col-sm-3 row items-center">
-          <div class="col-12">
-            <div class="col-12 text-top">ระดับ</div>
-            <div class="col-12 text-detail">
-              {{ title.positionLevelOld }}
-            </div>
-          </div>
-        </div>
-        <div class="col-xs-6 col-sm-3 row items-center">
-          <div class="col-12">
-            <div class="col-12 text-top">สังกัด</div>
-            <div class="col-12 text-detail">
-              {{ title.organizationPositionOld }}
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </q-card>
+  <CardProfile :data="dataProfile as DataProfile" />
+
 
   <q-card bordered class="row col-12 text-dark q-mt-sm">
     <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
@@ -1052,13 +1004,6 @@ onMounted(async () => {
       </div>
     </q-card>
   </q-card>
-
-  <PopupPersonal
-    :modal="modalPersonal"
-    :id="personId"
-    @update:modal="updatemodalPersonal"
-  />
-
 </template>
 
 <style lang="scss" scope>
diff --git a/src/modules/05_placement/interface/response/Receive.ts b/src/modules/05_placement/interface/response/Receive.ts
index ebfead083..aa1212665 100644
--- a/src/modules/05_placement/interface/response/Receive.ts
+++ b/src/modules/05_placement/interface/response/Receive.ts
@@ -233,6 +233,36 @@ interface TreeMain {
   totalRootPositionNextVacant: number;
 }
 
+interface DataProfile {
+  child1: string | null;
+  child1ShortName: string | null;
+  child2: string | null;
+  child2ShortName: string | null;
+  child3: string | null;
+  child3ShortName: string | null;
+  child4: string | null;
+  child4ShortName: string | null;
+  createdAt: string | Date;
+  dateEnd: string | Date;
+  dateStart: string | Date;
+  firstName: string;
+  id: string;
+  isActive: boolean;
+  lastName: string;
+  organization: string;
+  organizationPositionOld: string;
+  posLevelName: string;
+  posMasterNo: number | null;
+  posTypeName: string;
+  position: string;
+  prefix: string;
+  profileId: string;
+  reason: string;
+  root: string;
+  rootShortName: string | null;
+  status: string;
+}
+
 export type {
   ResponseTitle,
   ResponseData,
@@ -246,4 +276,5 @@ export type {
   Positions,
   DataPositionNo,
   TreeMain,
+  DataProfile,
 };