diff --git a/src/modules/04_registry/components/Salary.vue b/src/modules/04_registry/components/Salary.vue
index c64e1d23a..20d6bc9c0 100644
--- a/src/modules/04_registry/components/Salary.vue
+++ b/src/modules/04_registry/components/Salary.vue
@@ -82,7 +82,7 @@
-
- {{ col.value }}
+ {{ col.value ? col.value : "-" }}
@@ -829,8 +829,8 @@ profileData.salary.columns.length == 0
"posNo",
"positionLine",
"positionPathSide",
- "positionType",
- "positionLevel",
+ "postionTypeName",
+ "positionLevelName",
"positionExecutive",
// "positionExecutiveSide",
// "salaryClass",
@@ -939,22 +939,22 @@ const columns = ref([
// a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
// },
{
- name: "positionType",
+ name: "postionTypeName",
align: "left",
label: "ตำแหน่งประเภท",
sortable: true,
- field: "positionType",
+ field: "postionTypeName",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
{
- name: "positionLevel",
+ name: "positionLevelName",
align: "left",
label: "ระดับ",
sortable: true,
- field: "positionLevel",
+ field: "positionLevelName",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
sort: (a: string, b: string) =>
@@ -1404,6 +1404,8 @@ const fetchData = async () => {
.get(config.API.profileSalaryId(profileId.value))
.then((res) => {
let data = res.data.result;
+ console.log(data);
+
rows.value = [];
data.map((e: any) => {
rows.value.push({
@@ -1706,7 +1708,7 @@ const selectData = async (props: DataProps) => {
rawItem.value = props.row;
rowIndex.value = props.rowIndex;
id.value = props.row.id;
- inputDate.value = formDataSalary.date;
+ inputDate.value = formDataSalary.date.toString();
// console.log(props.row);
// date.value = props.row.date;