diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue index 5cce9711f..115915860 100644 --- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue +++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue @@ -110,7 +110,7 @@ const baseColumns = ref([ { name: "posNo", align: "left", - label: empType.value === "-employee" ? "ตำแหน่งเลขที่" : "เลขที่ตำแหน่ง", + label: empType.value === "" ? "เลขที่ตำแหน่ง" : "ตำแหน่งเลขที่", sortable: true, field: "posNo", headerStyle: "font-size: 14px", @@ -130,7 +130,7 @@ const baseColumns = ref([ { name: "positionName", align: "left", - label: empType.value === "-employee" ? "ตำแหน่ง" : "ตำแหน่งในสายงาน", + label: empType.value === "" ? "ตำแหน่งในสายงาน" : "ตำแหน่ง", sortable: true, field: "positionName", headerStyle: "font-size: 14px", @@ -143,7 +143,7 @@ const baseColumns = ref([ { name: "positionType", align: "left", - label: empType.value === "-employee" ? "กลุ่มงาน" : "ตำแหน่งประเภท", + label: empType.value === "" ? "ตำแหน่งประเภท" : "กลุ่มงาน", sortable: true, field: "positionType", headerStyle: "font-size: 14px", @@ -156,7 +156,7 @@ const baseColumns = ref([ { name: "positionLevel", align: "left", - label: empType.value === "-employee" ? "ระดับชั้นงาน" : "ระดับ", + label: empType.value === "" ? "ระดับ" : "ระดับชั้นงาน", sortable: true, field: "positionLevel", format(val, row) { @@ -237,7 +237,7 @@ const baseColumns = ref([ { name: "amount", align: "left", - label: empType.value === "-employee" ? "ค่าจ้าง" : "เงินเดือน", + label: empType.value === "" ? "เงินเดือน" : "ค่าจ้าง", sortable: true, field: "amount", headerStyle: "font-size: 14px", @@ -347,7 +347,7 @@ const baseVisibleColumns = ref([ ]); const columns = computed(() => { - if (empType.value === "-employee") { + if (empType.value !== "") { if (baseColumns.value) { return baseColumns.value.filter( (column) => @@ -371,7 +371,7 @@ const pagination = ref({ }); const columnsHistory = computed(() => { - if (empType.value === "-employee") { + if (empType.value !== "") { if (baseColumns.value) { return baseColumns.value.filter( (column) => @@ -961,8 +961,8 @@ onMounted(async () => {