diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue index ac9b28f3f..3ec16d409 100644 --- a/src/modules/13_salary/components/SalaryLists/TabMain.vue +++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue @@ -310,7 +310,7 @@ onMounted(async () => {
- {{ item.total.toLocaleString() }} + {{ item.total ? item.total.toLocaleString() : 0 }}
diff --git a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue index 90c9637bb..04cab0cbb 100644 --- a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue +++ b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue @@ -73,10 +73,19 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "posType", + align: "left", + label: "ตำแหน่งประเภท", + sortable: false, + field: "posType", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "posLevel", align: "left", - label: "ตำแหน่งประเภทระดับ", + label: "ระดับตำแหน่ง", sortable: false, field: "posLevel", headerStyle: "font-size: 14px", @@ -115,6 +124,7 @@ const visibleColumns = ref([ "posNo", "fullName", "position", + "posType", "posLevel", "posExecutive", "amount",