From 27b3a9e446c1df3ce7885894d8814d49095cee85 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 2 Sep 2024 14:16:24 +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=B7=20=3D=3D>=20=E0=B8=A5=E0=B8=B9=E0=B8=81?=
 =?UTF-8?q?=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=88=E0=B8=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/Employee/01_DataEmployee.vue       | 164 +++++++++---------
 1 file changed, 79 insertions(+), 85 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
index c735774be..e0550404a 100644
--- a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
+++ b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue
@@ -193,7 +193,6 @@ const columns = ref<QTableColumn[]>([
     label: "ค่าจ้าง",
     sortable: true,
     field: "employeeWage",
-    format: (v) => (v ? Number(v).toLocaleString() : ""),
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -203,7 +202,6 @@ const columns = ref<QTableColumn[]>([
     label: "เงินเพิ่มการครองชีพชั่วคราว",
     sortable: true,
     field: "employeeMoneyIncrease",
-    format: (v) => (v ? Number(v).toLocaleString() : ""),
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -213,7 +211,6 @@ const columns = ref<QTableColumn[]>([
     label: "เงินช่วยเหลือการครองชีพชั่วคราว",
     sortable: true,
     field: "employeeMoneyAllowance",
-    format: (v) => (v ? Number(v).toLocaleString() : ""),
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -223,7 +220,6 @@ const columns = ref<QTableColumn[]>([
     label: "เงินสมทบประกันสังคม(ลูกจ้าง)",
     sortable: true,
     field: "employeeMoneyEmployee",
-    format: (v) => (v ? Number(v).toLocaleString() : ""),
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -233,7 +229,6 @@ const columns = ref<QTableColumn[]>([
     label: "เงินสมทบประกันสังคม(นายจ้าง)",
     sortable: true,
     field: "employeeMoneyEmployer",
-    format: (v) => (v ? Number(v).toLocaleString() : ""),
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -323,92 +318,91 @@ onMounted(() => {
 
   <q-card bordered class="my-card bg-grey-1 q-pa-md">
     <div class="row q-col-gutter-md">
-
-    <!-- column 1 -->
-    <div class="col-12 col-sm-6 col-md-6 q-gutter-y-sm">
-      <div class="row items-center">
-        <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-          <div>กลุ่มงาน</div>
+      <!-- column 1 -->
+      <div class="col-12 col-sm-6 col-md-6 q-gutter-y-sm">
+        <div class="row items-center">
+          <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
+            <div>กลุ่มงาน</div>
+          </div>
+          <div class="col-12 col-sm-12 col-md-7">
+            {{ dataEmployee.positionEmployeeGroupId ?? "-" }}
+          </div>
         </div>
-        <div class="col-12 col-sm-12 col-md-7">
-          {{ dataEmployee.positionEmployeeGroupId ?? "-" }}
+        <div class="row items-center">
+          <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
+            <div>สายงาน</div>
+          </div>
+          <div class="col-12 col-sm-12 col-md-7">
+            {{ dataEmployee.positionEmployeeLineId ?? "-" }}
+          </div>
+        </div>
+        <div class="row items-center">
+          <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
+            <div>ตำแหน่งทางสายงาน</div>
+          </div>
+          <div class="col-12 col-sm-12 col-md-7">
+            {{ dataEmployee.positionEmployeePositionId ?? "-" }}
+          </div>
+        </div>
+        <div class="row items-center">
+          <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
+            <div>สังกัด</div>
+          </div>
+          <div class="col-12 col-sm-12 col-md-7">
+            {{ dataEmployee.employeeOc ?? "-" }}
+          </div>
+        </div>
+        <div class="row items-center">
+          <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
+            <div>ประเภทบุคคล</div>
+          </div>
+          <div class="col-12 col-sm-12 col-md-7">
+            {{ dataEmployee.employeeTypeIndividual ?? "-" }}
+          </div>
         </div>
       </div>
-      <div class="row items-center">
-        <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-          <div>สายงาน</div>
+      <div class="col-12 col-sm-6 col-md-6 q-gutter-y-sm">
+        <div class="row items-center">
+          <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
+            <div>ค่าจ้าง</div>
+          </div>
+          <div class="col-12 col-sm-12 col-md-7">
+            {{ dataEmployee.employeeWage ?? "-" }}
+          </div>
         </div>
-        <div class="col-12 col-sm-12 col-md-7">
-          {{ dataEmployee.positionEmployeeLineId ?? "-" }}
+        <div class="row items-start">
+          <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
+            <div>เงินเพิ่มการครองชีพชั่วคราว</div>
+          </div>
+          <div class="col-12 col-sm-12 col-md-7">
+            {{ dataEmployee.employeeMoneyIncrease ?? "-" }}
+          </div>
+        </div>
+        <div class="row items-start">
+          <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
+            <div>เงินช่วยเหลือการครองชีพชั่วคราว</div>
+          </div>
+          <div class="col-12 col-sm-12 col-md-7">
+            {{ dataEmployee.employeeMoneyAllowance ?? "-" }}
+          </div>
+        </div>
+        <div class="row items-start">
+          <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
+            <div>เงินสมทบประกันสังคม (ลูกจ้าง)</div>
+          </div>
+          <div class="col-12 col-sm-12 col-md-7">
+            {{ dataEmployee.employeeMoneyEmployee ?? "-" }}
+          </div>
+        </div>
+        <div class="row items-start">
+          <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
+            <div>เงินสมทบประกันสังคม (นายจ้าง)</div>
+          </div>
+          <div class="col-12 col-sm-12 col-md-7">
+            {{ dataEmployee.employeeMoneyEmployer ?? "-" }}
+          </div>
         </div>
       </div>
-      <div class="row items-center">
-        <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-          <div>ตำแหน่งทางสายงาน</div>
-        </div>
-        <div class="col-12 col-sm-12 col-md-7">
-          {{ dataEmployee.positionEmployeePositionId ?? "-" }}
-        </div>
-      </div>
-      <div class="row items-center">
-        <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-          <div>สังกัด</div>
-        </div>
-        <div class="col-12 col-sm-12 col-md-7">
-          {{ dataEmployee.employeeOc ?? "-" }}
-        </div>
-      </div>
-      <div class="row items-center">
-        <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-          <div>ประเภทบุคคล</div>
-        </div>
-        <div class="col-12 col-sm-12 col-md-7">
-          {{ dataEmployee.employeeTypeIndividual ?? "-" }}
-        </div>
-      </div>
-    </div>
-    <div class="col-12 col-sm-6 col-md-6 q-gutter-y-sm">
-      <div class="row items-center">
-        <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-          <div>ค่าจ้าง</div>
-        </div>
-        <div class="col-12 col-sm-12 col-md-7">
-          {{ dataEmployee.employeeWage ?? "-" }}
-        </div>
-      </div>
-      <div class="row items-start ">
-        <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-          <div>เงินเพิ่มการครองชีพชั่วคราว</div>
-        </div>
-        <div class="col-12 col-sm-12 col-md-7">
-          {{ dataEmployee.employeeMoneyIncrease ?? "-" }}
-        </div>
-      </div>
-      <div class="row items-start ">
-        <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-          <div>เงินช่วยเหลือการครองชีพชั่วคราว</div>
-        </div>
-        <div class="col-12 col-sm-12 col-md-7">
-          {{ dataEmployee.employeeMoneyAllowance ?? "-" }}
-        </div>
-      </div>
-      <div class="row items-start ">
-        <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-          <div>เงินสมทบประกันสังคม (ลูกจ้าง)</div>
-        </div>
-        <div class="col-12 col-sm-12 col-md-7">
-          {{ dataEmployee.employeeMoneyEmployee ?? "-" }}
-        </div>
-      </div>
-      <div class="row items-start ">
-        <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
-          <div>เงินสมทบประกันสังคม (นายจ้าง)</div>
-        </div>
-        <div class="col-12 col-sm-12 col-md-7">
-          {{ dataEmployee.employeeMoneyEmployer ?? "-" }}
-        </div>
-      </div>
-    </div>
     </div>
   </q-card>