diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue index 0b9a2d93a..fcfa508ff 100644 --- a/src/modules/04_registryPerson/views/detailView.vue +++ b/src/modules/04_registryPerson/views/detailView.vue @@ -102,8 +102,6 @@ const baseItemsMenu = ref([ ]); const itemsMenu = computed(() => { - console.log(leaveReason.value); - if ( leaveReason.value === "(พ้นจากราชการด้วยสาเหตุ: ได้รับโทษทางวินัย ให้ออกจากราชการไว้ก่อน)" || diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue b/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue index ac13456c6..4dbd8cb5d 100644 --- a/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue +++ b/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue @@ -71,11 +71,11 @@ const columns = ref([ style: "font-size: 14px", }, { - name: "posTypeName", + name: "posType", align: "left", label: "กลุ่มงาน", sortable: true, - field: "posTypeName", + field: "posType", headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -87,6 +87,9 @@ const columns = ref([ field: "posLevelName", headerStyle: "font-size: 14px", style: "font-size: 14px", + format(val, row) { + return `${row.posTypeShort}${row.posLevel}`; + }, }, ]); /** ข้อมูุลค้นหา*/ @@ -227,7 +230,6 @@ watch(