From c07163b74fc034df664e73dac04087353e3d5bf7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 29 Jul 2025 10:59:19 +0700 Subject: [PATCH 1/4] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20q-skeleton=20=3D=3D=3D>=20PopupPersonalNew?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialogs/PopupPersonalNew.vue | 607 ++++++++++-------- .../components/02_resign/ResignByid.vue | 2 +- .../components/03_resignEmp/ResignByid.vue | 2 +- 3 files changed, 333 insertions(+), 278 deletions(-) diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue index 0f9c2c695..2daefc91c 100644 --- a/src/components/Dialogs/PopupPersonalNew.vue +++ b/src/components/Dialogs/PopupPersonalNew.vue @@ -55,6 +55,7 @@ const emit = defineEmits(["update:modal"]); /** ตัวแปร*/ const modal = ref(false); +const isLoading = ref(true); const employeeClass = ref(""); const avatar = reactive({ avatar: "", @@ -128,7 +129,7 @@ function calculateAge(birthDate: Date | null) { * @param id profileID */ async function fetchInformation(id: string) { - showLoader(); + isLoading.value = true; await http .get( config.API.orgProfileById( @@ -182,7 +183,7 @@ async function fetchInformation(id: string) { messageError($q, err); }) .finally(() => { - hideLoader(); + isLoading.value = false; }); } @@ -324,7 +325,33 @@ watch(modal, (newValue) => {
- +
+ + + + +
+
{ />
+
{ ข้อมูลส่วนตัว
-
+
+
+ +
+
+
{ }}
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
+ +
- -
-
- +
-
-
- +
+
+
+ +
+
+ +
+
+ +
+
+ +
-
- + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
-
- -
+
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- +
+ +
+ +
+ +
+ +
+ +
diff --git a/src/modules/06_retirement/components/02_resign/ResignByid.vue b/src/modules/06_retirement/components/02_resign/ResignByid.vue index a33f25fcf..835bb256a 100644 --- a/src/modules/06_retirement/components/02_resign/ResignByid.vue +++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue @@ -23,7 +23,7 @@ import type { import type { QTableProps } from "quasar"; import type { DataProfile } from "@/modules/05_placement/interface/index/Main"; -import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue"; +import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue"; import CardProfile from "@/components/CardProfile.vue"; import DialogAddCommander from "@/modules/06_retirement/components/DialogAddCommander.vue"; diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue index ec11f42b2..e32532c16 100644 --- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue +++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue @@ -25,7 +25,7 @@ import type { } from "@/modules/06_retirement/interface/response/Main"; import DialogHeader from "@/components/DialogHeader.vue"; -import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue"; +import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue"; import CardProfile from "@/components/CardProfile.vue"; import DialogAddCommander from "@/modules/06_retirement/components/DialogAddCommander.vue"; From 3eb59464895142db4c21fcdcc9e8c6a61666a7fc Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 29 Jul 2025 11:54:44 +0700 Subject: [PATCH 2/4] =?UTF-8?q?fix=20skeleton=20=3D=3D>=20=20=E0=B8=82?= =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=95=E0=B8=B3?= =?UTF-8?q?=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialogs/PopupPersonalNew.vue | 8 ++++++-- src/modules/21_report/components/CardPosition.vue | 12 +++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue index 73808d6d0..4ef7825b6 100644 --- a/src/components/Dialogs/PopupPersonalNew.vue +++ b/src/components/Dialogs/PopupPersonalNew.vue @@ -505,9 +505,13 @@ watch(modal, (newValue) => {
diff --git a/src/modules/21_report/components/CardPosition.vue b/src/modules/21_report/components/CardPosition.vue index 956639272..3c7b12214 100644 --- a/src/modules/21_report/components/CardPosition.vue +++ b/src/modules/21_report/components/CardPosition.vue @@ -35,9 +35,11 @@ const cardData = ref([ data: [], }, ]); +const isLoading = ref(true); async function fetchDataTenure() { if (props?.id) { + isLoading.value = true; await http .get( config.API.salaryTenurePosition( @@ -73,6 +75,9 @@ async function fetchDataTenure() { }) .catch((err) => { messageError($q, err); + }) + .finally(() => { + isLoading.value = false; }); } } @@ -88,7 +93,12 @@ onMounted(() => { ข้อมูลตำแหน่ง
-
+
+ + + +
+
From ee9470182fa7bb0d32aeca384af80adf581e17f6 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 29 Jul 2025 13:21:20 +0700 Subject: [PATCH 3/4] =?UTF-8?q?fix=20colums=20no=20=20=3D=3D=3D>=20?= =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99?= =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?= =?UTF-8?q?=20=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?= =?UTF-8?q?=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=87?= =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/detail/Achievement/03_Insignia.vue | 1 + .../04_registryPerson/components/detail/DialogHistory.vue | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue index 8930247e3..e0e465e7d 100644 --- a/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue +++ b/src/modules/04_registryPerson/components/detail/Achievement/03_Insignia.vue @@ -1311,6 +1311,7 @@ onMounted(async () => { :title="`ประวัติแก้ไขเครื่องราชอิสริยาภรณ์`" :columns="columnsHistory" :fetch-data="fetchDataHistory" + :type="'insignia'" /> diff --git a/src/modules/04_registryPerson/components/detail/DialogHistory.vue b/src/modules/04_registryPerson/components/detail/DialogHistory.vue index 9da53b81a..ceab6ee49 100644 --- a/src/modules/04_registryPerson/components/detail/DialogHistory.vue +++ b/src/modules/04_registryPerson/components/detail/DialogHistory.vue @@ -17,6 +17,7 @@ const columns = defineModel("columns", { const visibleColumnsMain = defineModel("visibleColumns", { required: true, }); +const type = defineModel("type", { default: "" }); const props = defineProps({ fetchData: { type: Function, required: true }, @@ -114,7 +115,7 @@ watch(