From 77e68ab87118112da6405c3cf38f4038ac96c02c Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 3 Apr 2024 11:43:24 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=81?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=84=E0=B8=AD=E0=B8=A1=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=A1=E0=B8=99=E0=B9=8C=20=E0=B9=81=E0=B8=81?=
 =?UTF-8?q?=E0=B9=89=20bug=20=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B9=80?=
 =?UTF-8?q?=E0=B8=81=E0=B8=A9=E0=B8=B5=E0=B8=A2=E0=B8=93=20=E0=B8=82?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=99=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B8=88=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=87=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SalaryEmployeeLists/TableTypeOther.vue    | 42 +++++++++++++++----
 .../SalaryEmployeeLists/TableTypePending.vue  | 23 ++++++++++
 .../components/SalaryLists/TableTypeOther.vue |  8 +---
 3 files changed, 60 insertions(+), 13 deletions(-)

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<QTableProps["columns"]>([
     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<QTableProps["columns"]>([
     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<string[]>([
   "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(
             }}
           </div>
 
-          <div
-            v-else-if="
-              col.name === 'isRetired' && store.roundMainCode === 'OCT'
-            "
-          >
+          <div v-else-if="col.name === 'isRetired'">
             <q-icon
               name="check"
               color="primary"
               size="24px"
-              v-if="props.row.isRetired"
+              v-if="props.row.isRetired && store.roundMainCode === 'OCT'"
             />
           </div>
 
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<QTableProps["columns"]>([
     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<string[]>([
   "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(
             }}
           </div>
 
-          <div
-            v-else-if="
-              col.name === 'isRetired' && store.roundMainCode === 'OCT'
-            "
-          >
+          <div v-else-if="col.name === 'isRetired'">
             <q-icon
               name="check"
               color="primary"
               size="24px"
-              v-if="props.row.isRetired"
+              v-if="props.row.isRetired && store.roundMainCode === 'OCT'"
             />
           </div>