From 81fd3a3ac8126da49950d63545beb8c4fff9dae8 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Mon, 29 Apr 2024 17:31:02 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=A3?= =?UTF-8?q?=E0=B8=B9=E0=B8=9B=E0=B9=82=E0=B8=9B=E0=B8=A3=E0=B9=84=E0=B8=9F?= =?UTF-8?q?=E0=B8=A5=E0=B9=8C=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=97=E0=B8=B0?= =?UTF-8?q?=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3?= =?UTF-8?q?=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../04_registryNew/components/TableView.vue | 15 +-- .../components/detail/TabMain.vue | 96 +++++++++---------- .../04_registryNew/interface/response/Main.ts | 1 + .../04_registryNew/views/detailView.vue | 54 +++++------ src/modules/04_registryNew/views/list.vue | 42 +++++++- 5 files changed, 117 insertions(+), 91 deletions(-) diff --git a/src/modules/04_registryNew/components/TableView.vue b/src/modules/04_registryNew/components/TableView.vue index e362344f2..f7470769c 100644 --- a/src/modules/04_registryNew/components/TableView.vue +++ b/src/modules/04_registryNew/components/TableView.vue @@ -295,16 +295,7 @@ watch( - - + @@ -332,8 +323,8 @@ watch(
- - + +
diff --git a/src/modules/04_registryNew/components/detail/TabMain.vue b/src/modules/04_registryNew/components/detail/TabMain.vue index 7664becd5..e8b2c2a64 100644 --- a/src/modules/04_registryNew/components/detail/TabMain.vue +++ b/src/modules/04_registryNew/components/detail/TabMain.vue @@ -43,59 +43,53 @@ const splitterModel = ref(12); diff --git a/src/modules/04_registryNew/interface/response/Main.ts b/src/modules/04_registryNew/interface/response/Main.ts index 1a3c81114..5735b5363 100644 --- a/src/modules/04_registryNew/interface/response/Main.ts +++ b/src/modules/04_registryNew/interface/response/Main.ts @@ -13,6 +13,7 @@ interface DataLevel { } interface DataPerson { + avatar?: string; citizenId: string; firstName: string; id: string; diff --git a/src/modules/04_registryNew/views/detailView.vue b/src/modules/04_registryNew/views/detailView.vue index 538b0f3b3..870e0d77d 100644 --- a/src/modules/04_registryNew/views/detailView.vue +++ b/src/modules/04_registryNew/views/detailView.vue @@ -285,21 +285,21 @@ async function clickSaveDeceased() { formData.append("Reason", reasonDeath.value); formData.append("ProfileId", profileId.value); - dialogConfirm($q,()=>{ + dialogConfirm($q, () => { showLoader(); - http - .post(config.API.listDeceased(), formData) - .then(() => { - success($q, "บันทึกข้อมูลสำเร็จ"); - router.push("/deceased"); - }) - .catch((e) => { - messageError($q, e); - }) - .finally(() => { - hideLoader(); - }); - }) + http + .post(config.API.listDeceased(), formData) + .then(() => { + success($q, "บันทึกข้อมูลสำเร็จ"); + router.push("/deceased"); + }) + .catch((e) => { + messageError($q, e); + }) + .finally(() => { + hideLoader(); + }); + }); } onMounted(async () => { @@ -381,11 +381,11 @@ onMounted(async () => {
- +
-
+

{

- - + + {
-
+
ตำแหน่งในสายงาน
@@ -584,13 +584,13 @@ h2.title { border-radius: 10px; } -.bg-toolbar{ - background-color: #F2FBFA; +.bg-toolbar { + background-color: #f2fbfa; } -.btnEditImg{ - position: absolute; - bottom: 0; - right: 0; - border: 1px solid #EDEDED ; +.btnEditImg { + position: absolute; + bottom: 0; + right: 0; + border: 1px solid #ededed; } - \ No newline at end of file + diff --git a/src/modules/04_registryNew/views/list.vue b/src/modules/04_registryNew/views/list.vue index 9312f21ae..25d52e4e1 100644 --- a/src/modules/04_registryNew/views/list.vue +++ b/src/modules/04_registryNew/views/list.vue @@ -12,6 +12,7 @@ import type { FormFilter } from "@/modules/04_registryNew/interface/request/Main /** importComponents*/ import TableView from "@/modules/04_registryNew/components/TableView.vue"; +import avatar from "@/assets/avatar_user.jpg"; /** importStore*/ import { useRegistryNewDataStore } from "@/modules/04_registryNew/store"; @@ -152,6 +153,7 @@ async function fetchDataPerson(search: boolean = false) { maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize); dataPersonMain.value = res.data.result.data; total.value = res.data.result.total; + insertAvatar(res.data.result.data); }) .catch((err) => { messageError($q, err); @@ -163,6 +165,44 @@ async function fetchDataPerson(search: boolean = false) { }); } +function insertAvatar(items: DataPerson[]) { + items.map((x: any, index: number) => { + http + .get( + config.API.fileByFile( + "ทะเบียนประวัติ", + "โปรไฟล์", + x.id, + "profile-" + x.id + ) + ) + .then((img) => { + dataPersonMain.value[index] = { + ...x, + avatar: img.data.downloadUrl, + }; + }) + .catch(() => { + dataPersonMain.value[index] = { + ...x, + avatar: avatar, + }; + }); + }); +} +// const convertImageProfile = (id: string) => { +// return http +// .get( +// config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, "profile-" + id) +// ) +// .then((res) => { +// return res.data.downloadUrl; +// }) +// .catch(() => { +// return avatar; +// }); +// }; + function onClickShowFilter() { isShowFilter.value = !isShowFilter.value; isShowBtnFilter.value = false; @@ -229,7 +269,7 @@ onMounted(async () => { ข้อมูลทะเบียนประวัติ
--> - +
ค้นหาข้อมูลทะเบียนประวัติ