From 4fecce4663d7eb80cef324ed0fa75555bb3d96ed Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 9 Apr 2025 16:06:11 +0700
Subject: [PATCH] fix columns

---
 .../DialogAddPerson.vue                       | 14 ++++++++++
 .../05_salaryListsEmployee/TableTypeOther.vue | 20 +++++++------
 .../TableTypePending.vue                      | 28 +++++++++++++++----
 .../views/05_salaryListsEmployee.vue          |  4 +++
 4 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue b/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue
index e292c7ec5..e4dd670f0 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue
@@ -61,6 +61,20 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "posNo",
+    align: "left",
+    label: "ตำแหน่งเลขที่",
+    sortable: false,
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.orgShortName && row.posMasterNo
+        ? `${row.orgShortName} ${row.posMasterNo}`
+        : "-";
+    },
+  },
   {
     name: "position",
     align: "left",
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
index e055cd0a3..306e3ce17 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
@@ -54,15 +54,7 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "posNo",
-    align: "left",
-    label: "ตำแหน่งเลขที่",
-    sortable: false,
-    field: "posNo",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+
   {
     name: "fullName",
     align: "left",
@@ -72,6 +64,15 @@ const baseColumns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "posNo",
+    align: "left",
+    label: "ตำแหน่งเลขที่",
+    sortable: false,
+    field: "posNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "position",
     align: "left",
@@ -441,6 +442,7 @@ watch(
             </q-menu>
           </q-btn>
         </q-td>
+
         <q-td
           v-for="col in props.cols"
           :key="col.name"
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
index a7f41281d..16f0a8759 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
@@ -72,14 +72,20 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
   {
-    name: "posType",
+    name: "posNo",
     align: "left",
-    label: "กลุ่มงาน",
+    label: "ตำแหน่งเลขที่",
     sortable: false,
-    field: "posType",
+    field: "posNo",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return row.orgShortName && row.posMasterNo
+        ? `${row.orgShortName} ${row.posMasterNo}`
+        : "-";
+    },
   },
+
   {
     name: "position",
     align: "left",
@@ -89,6 +95,15 @@ const columns = ref<QTableProps["columns"]>([
     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",
@@ -107,7 +122,7 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return val ? "กลุ่ม" + val : "-";
+      return val ? `กลุ่ม${val}` : "-";
     },
   },
   {
@@ -186,6 +201,7 @@ const columns = ref<QTableProps["columns"]>([
 const visibleColumns = ref<string[]>([
   "no",
   "fullName",
+  "posNo",
   "posType",
   "position",
   "posLevel",
@@ -512,7 +528,9 @@ watch(
               dense
               icon="info"
               class="q-pa-none q-ml-xs"
-              color="info"
+              :color="
+                col.name == 'discipline' && props.row.isPunish ? 'red' : 'info'
+              "
               size="12px"
               @click.pervent="onClickViewInfo(col.name, props.row.profileId)"
             >
diff --git a/src/modules/13_salary/views/05_salaryListsEmployee.vue b/src/modules/13_salary/views/05_salaryListsEmployee.vue
index e7973cafa..20522fa8c 100644
--- a/src/modules/13_salary/views/05_salaryListsEmployee.vue
+++ b/src/modules/13_salary/views/05_salaryListsEmployee.vue
@@ -196,6 +196,7 @@ async function getAgency(id: string) {
       })
       .catch((err) => {
         messageError($q, err);
+        hideLoader();
       }));
 }
 
@@ -227,6 +228,7 @@ async function getAgencyPosition(id: string) {
       })
       .catch((err) => {
         messageError($q, err);
+        hideLoader();
       });
   } else agencyFilter.value = "";
 }
@@ -263,6 +265,7 @@ async function fetchSalalyPeriod(
       })
       .catch((err) => {
         messageError($q, err);
+        hideLoader();
       });
   }
 }
@@ -380,6 +383,7 @@ async function fetchCheckisOfficer() {
     })
     .catch((e) => {
       messageError($q, e);
+      hideLoader();
     });
 }