diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue index cd5d0de87..440fd76c6 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue @@ -76,6 +76,15 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "posLevel", + align: "left", + label: "ระดับชั้นงาน", + sortable: false, + field: "posLevel", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "posType", align: "left", @@ -94,6 +103,27 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "group", + align: "left", + label: "ผังค่าจ้าง(เดิม)", + sortable: false, + field: "group", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format(val, row) { + return val ? "กลุ่ม" + val : "-"; + }, + }, + { + name: "salaryLevel", + align: "left", + label: "ขั้น(เดิม)", + sortable: false, + field: "salaryLevel", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "amount", align: "left", @@ -144,6 +174,8 @@ const visibleColumns = ref([ "amountUse", "positionSalaryAmount", "isRetired", + "group", + "salaryLevel", ]); /** modalDialog*/ @@ -283,7 +315,7 @@ watch( store.roundMainCode === 'OCT' ? columns : columns - ? columns.slice(0, 10) + ? columns.slice(0, 12) : [] " option-value="name" @@ -382,16 +414,12 @@ watch( }} -
+
diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue index 3828cd401..fcc0ea9a9 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue @@ -89,6 +89,27 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "group", + align: "left", + label: "ผังค่าจ้าง(เดิม)", + sortable: false, + field: "group", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format(val, row) { + return val ? "กลุ่ม" + val : "-"; + }, + }, + { + name: "salaryLevel", + align: "left", + label: "ขั้น(เดิม)", + sortable: false, + field: "salaryLevel", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "amount", align: "left", @@ -176,6 +197,8 @@ const visibleColumns = ref([ "isSuspension", "isAbsent", "isLeave", + "group", + "salaryLevel", ]); /** modalDialog*/ diff --git a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue index df1098e0a..63a23d1a9 100644 --- a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue +++ b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue @@ -392,16 +392,12 @@ watch( }}
-
+