From a51c1fe518b1b08d87e42d769a64a28f08fde99b Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 11 Nov 2024 09:33:25 +0700 Subject: [PATCH 1/3] =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=B2>>=E0=B8=A5?= =?UTF-8?q?=E0=B8=B2=E0=B8=AD=E0=B8=B8=E0=B8=9B=E0=B8=AA=E0=B8=A1=E0=B8=9A?= =?UTF-8?q?=E0=B8=97=20(=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?= =?UTF-8?q?=E0=B8=A5=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88?= =?UTF-8?q?=E0=B8=A5=E0=B8=B2=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=81=E0=B8=AA?= =?UTF-8?q?=E0=B8=94=E0=B8=87)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../09_leave/components/2_Leave/formDetail/formUpasom.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue b/src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue index e340333cf..e300a49bf 100644 --- a/src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue +++ b/src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue @@ -16,11 +16,11 @@ const props = defineProps({
ลาตั้งแต่วันที่
-
{{ props.data.leaveLastStart }}
+
{{ props.data.leaveDateStart }}
ลาถึงวันที่
-
{{ props.data.leaveLastEnd }}
+
{{ props.data.leaveDateEnd }}
จำนวนวันที่ลา
From f0187c9ffea9dbc1dace997b8c7aa65dca9b9897 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 11 Nov 2024 10:05:51 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?= =?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=E0=B8=AF>>=E0=B8=9A=E0=B8=B1?= =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81=E0=B8=9C=E0=B8=A5=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=AA=E0=B8=99=E0=B8=AD=E0=B8=82?= =?UTF-8?q?=E0=B8=AD=20(=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?= =?UTF-8?q?=E0=B8=A5=E0=B8=84=E0=B8=AD=E0=B8=A5=E0=B8=B1=E0=B8=A1=E0=B8=99?= =?UTF-8?q?=E0=B9=8C=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88?= =?UTF-8?q?=E0=B8=87)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/07_insignia/views/03_ResultMain.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/modules/07_insignia/views/03_ResultMain.vue b/src/modules/07_insignia/views/03_ResultMain.vue index e600bc9df..6d42aa4e7 100644 --- a/src/modules/07_insignia/views/03_ResultMain.vue +++ b/src/modules/07_insignia/views/03_ResultMain.vue @@ -85,6 +85,7 @@ const columns = ref([ sort: (a: string, b: string) => a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, + { name: "citizenId", align: "left", @@ -103,6 +104,15 @@ const columns = ref([ sort: (a: string, b: string) => a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, + { + name: "position", + align: "left", + label: "ตำแหน่ง", + field: "position", + sortable: true, + sort: (a: string, b: string) => + a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + }, { name: "employeeType", align: "left", @@ -219,6 +229,7 @@ const visibleColumns = ref([ "status", "citizenId", "name", + "position", "type", "dateReceive", "date", From f7b89557ad2923be2cd8b1519323f09b51fd48b8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 11 Nov 2024 10:13:18 +0700 Subject: [PATCH 3/3] =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=B2=20Admin=20>>=20?= =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=AD?= =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=94=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A5?= =?UTF-8?q?=E0=B8=B2=20(=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B8=82=E0=B8=B5=E0=B8=94=20(-)=20=E0=B9=80=E0=B8=A1=E0=B8=B7?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?= =?UTF-8?q?=E0=B8=A5=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B8=A1=E0=B8=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../09_leave/components/2_Leave/DetailLeave.vue | 5 ++--- .../2_Leave/formDetail/formCheckSelect.vue | 8 +++++++- .../components/2_Leave/formDetail/formChildbirth.vue | 4 +++- .../components/2_Leave/formDetail/formLeave.vue | 4 +++- .../2_Leave/formDetail/formLeaveToTraining.vue | 8 +++++++- .../components/2_Leave/formDetail/formSpouse.vue | 12 ++++++++++-- .../components/2_Leave/formDetail/formUpasom.vue | 12 ++++++++++-- 7 files changed, 42 insertions(+), 11 deletions(-) diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue index bdb15c37e..6d7d0cc28 100644 --- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue +++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue @@ -167,8 +167,7 @@ async function fetchDetailLeave(paramsId: string) { formData.leaveDraftDocument = data.leaveDraftDocument; formData.leaveLastStart = data.leaveLastStart && date2Thai(data.leaveLastStart); - formData.leaveLastEnd = - data.leaveLastStart && date2Thai(data.leaveLastEnd); + formData.leaveLastEnd = data.leaveLastEnd && date2Thai(data.leaveLastEnd); formData.leaveTotal = data.leaveTotal ? data.leaveTotal : "0"; formData.leavebirthDate = data.leaveBirthDate && date2Thai(data.leaveBirthDate); @@ -263,7 +262,7 @@ async function fetchDetailLeave(paramsId: string) { formData.coupleDaySumTotalHistory = data.coupleDaySumTotalHistory ? data.coupleDaySumTotalHistory : "-"; - formData.approveStep = data.approveStep; + formData.approveStep = data.approveStep ? data.approveStep : "-"; formData.dear = data.dear ? data.dear : "-"; /** ส่งประเภทของการลาไป Function เช็คประเภทการลา*/ diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue b/src/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue index c38db2a18..8559b57b8 100644 --- a/src/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue +++ b/src/modules/09_leave/components/2_Leave/formDetail/formCheckSelect.vue @@ -36,7 +36,13 @@ const props = defineProps({
ลงวันที่
-
{{ props.data.absentDayRegistorDate }}
+
+ {{ + props.data.absentDayRegistorDate + ? props.data.absentDayRegistorDate + : "-" + }} +
ให้เข้ารับการ
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue b/src/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue index 9b46c2309..9127575c1 100644 --- a/src/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue +++ b/src/modules/09_leave/components/2_Leave/formDetail/formChildbirth.vue @@ -31,7 +31,9 @@ const props = defineProps({
วันที่คลอด
-
{{ props.data.wifeDayDateBorn }}
+
+ {{ props.data.wifeDayDateBorn ? props.data.wifeDayDateBorn : "-" }} +
หมายเลขที่ติดต่อขณะลา
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue b/src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue index 65bc14d48..316010402 100644 --- a/src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue +++ b/src/modules/09_leave/components/2_Leave/formDetail/formLeave.vue @@ -42,7 +42,9 @@ const props = defineProps({
ลาครั้งสุดท้ายในประเภทนั้น ๆ เมื่อวันที่
-
{{ props.data.leaveLastStart }}
+
+ {{ props.data.leaveLastStart ? props.data.leaveLastStart : "-" }} +
หมายเลขที่ติดต่อขณะลา
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue b/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue index 3f8a44d5d..28179b58c 100644 --- a/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue +++ b/src/modules/09_leave/components/2_Leave/formDetail/formLeaveToTraining.vue @@ -71,7 +71,13 @@ function convertDateToEng(dataThia: string) {
วันที่เข้ารับราชการ
-
{{ props.data.leavegovernmentDate }}
+
+ {{ + props.data.leavegovernmentDate + ? props.data.leavegovernmentDate + : "-" + }} +
เงินเดือนปัจจุบัน
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue b/src/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue index e3ce29314..e6c4c9154 100644 --- a/src/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue +++ b/src/modules/09_leave/components/2_Leave/formDetail/formSpouse.vue @@ -67,11 +67,19 @@ function convertDateToEng(dataThia: string) {
วันเดือนปีเกิด
-
{{ props.data.leavebirthDate }}
+
+ {{ props.data.leavebirthDate ? props.data.leavebirthDate : "-" }} +
วันที่เข้ารับราชการ
-
{{ props.data.leavegovernmentDate }}
+
+ {{ + props.data.leavegovernmentDate + ? props.data.leavegovernmentDate + : "-" + }} +
เงินเดือนปัจจุบัน
diff --git a/src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue b/src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue index e300a49bf..d009f26b4 100644 --- a/src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue +++ b/src/modules/09_leave/components/2_Leave/formDetail/formUpasom.vue @@ -28,11 +28,19 @@ const props = defineProps({
วันเดือนปีเกิด
-
{{ props.data.leavebirthDate }}
+
+ {{ props.data.leavebirthDate ? props.data.leavebirthDate : "-" }} +
วันที่เข้ารับราชการ
-
{{ props.data.leavegovernmentDate }}
+
+ {{ + props.data.leavegovernmentDate + ? props.data.leavegovernmentDate + : "-" + }} +
เคย/ไม่เคยบวช