From fb5017b0e21dedc624b4acf5f81fe6e0d091ddd0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 14 Feb 2024 13:27:15 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4=20=3D>=20=E0=B8=95=E0=B8=B3=E0=B9=81?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87/=E0=B9=80=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/04_registry/components/Salary.vue | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

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 @@
                 -
               </div>
               <div v-else class="table_ellipsis">
-                {{ col.value }}
+                {{ col.value ? col.value : "-" }}
               </div>
             </q-td>
             <q-td auto-width>
@@ -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<QTableProps["columns"]>([
   //       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;