diff --git a/src/components/CardProfile.vue b/src/components/CardProfile.vue index b275af850..2576a9247 100644 --- a/src/components/CardProfile.vue +++ b/src/components/CardProfile.vue @@ -134,7 +134,7 @@ watch( -
+
{{ props.type == "employee" ? "ตำแหน่ง" : "ตำแหน่งในสายงาน" }} @@ -144,7 +144,7 @@ watch(
-
+
{{ props.type == "employee" ? "กลุ่มงาน" : "ประเภทตำแหน่ง" }} @@ -154,7 +154,7 @@ watch(
-
+
สังกัด
diff --git a/src/modules/05_placement/components/Other/Main.vue b/src/modules/05_placement/components/Other/Main.vue index 3402dd0f4..9af971be0 100644 --- a/src/modules/05_placement/components/Other/Main.vue +++ b/src/modules/05_placement/components/Other/Main.vue @@ -316,7 +316,12 @@ onMounted(() => {
{{ col.value ? col.value : "-" }}
diff --git a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue index 698dce91b..cea4b5420 100644 --- a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue +++ b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue @@ -287,7 +287,7 @@ const pagination = ref({
{{ col.value ? col.value : "-" }}
diff --git a/src/modules/06_retirement/components/resign/Resign.vue b/src/modules/06_retirement/components/resign/Resign.vue index 459aa2327..382f585af 100644 --- a/src/modules/06_retirement/components/resign/Resign.vue +++ b/src/modules/06_retirement/components/resign/Resign.vue @@ -341,7 +341,7 @@ const pagination = ref({ : '' " > - {{ col.value == null ? "" : col.value }} + {{ col.value == null ? "-" : col.value }}
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue index e1ebe3054..530b021b3 100644 --- a/src/modules/06_retirement/views/Main.vue +++ b/src/modules/06_retirement/views/Main.vue @@ -364,7 +364,7 @@ const typeReportChangeName = (val: string) => { {{ props.rowIndex + 1 }} - {{ props.row.signDate }} + {{ props.row.signDate ? props.row.signDate : "-" }} {{ props.row.Date }} diff --git a/src/modules/09_leave/views/LeaveListMain.vue b/src/modules/09_leave/views/LeaveListMain.vue index 859a37831..afba501f3 100644 --- a/src/modules/09_leave/views/LeaveListMain.vue +++ b/src/modules/09_leave/views/LeaveListMain.vue @@ -26,7 +26,7 @@ const leaveStore = useLeavelistDataStore(); -
+