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 4abbd2cf6..82d0cb7df 100644 --- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue +++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue @@ -60,11 +60,11 @@ const command = ref(""); const commandId = ref(""); const baseColumns = ref([ { - name: "date", + name: "commandDateAffect", align: "left", label: "วัน เดือน ปี", sortable: true, - field: "date", + field: "commandDateAffect", headerStyle: "font-size: 14px", style: "font-size: 14px", format: (v) => date2Thai(v), @@ -110,11 +110,11 @@ const baseColumns = ref([ style: "font-size: 14px", }, { - name: "position", + name: "positionName", align: "left", label: "ตำแหน่ง", sortable: true, - field: "position", + field: "positionName", headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -133,16 +133,24 @@ const baseColumns = ref([ label: "ระดับ", sortable: true, field: "positionLevel", + format(val, row) { + return `${ + row.positionLevel + ? row.positionLevel + : row.positionCee + ? row.positionCee + : "-" + }`; + }, headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "templateDoc", + name: "commandName", align: "left", label: "เอกสารอ้างอิง", sortable: true, - field: "templateDoc", + field: "commandName", headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -152,6 +160,20 @@ const baseColumns = ref([ label: "เลขที่คำสั่ง", sortable: true, field: "refCommandNo", + format(val, row) { + return row.commandNo && row.commandYear + ? `${row.commandNo}/${row.commandYear}` + : ""; + }, + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, + { + name: "remark", + align: "left", + label: "หมายเหตุ", + sortable: true, + field: "remark", headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -169,16 +191,17 @@ const columns = computed(() => { return baseColumns.value; }); const visibleColumns = ref([ - "date", + "commandDateAffect", "amount", "positionSalaryAmount", "mouthSalaryAmount", "posNo", - "position", + "positionName", "positionType", "positionLevel", - "templateDoc", + "commandName", "refCommandNo", + "remark", ]); const pagination = ref({ page: 1,