From 49bbf92b4f223a10980e79be1de4aac3e539b8eb Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Oct 2023 17:40:38 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20Columns?=
 =?UTF-8?q?=20=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EditEmployee/Employment.vue    | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue b/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue
index 8532c0472..17e53f526 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Employment.vue
@@ -223,28 +223,28 @@ const columnsHis = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "createdFullName",
-    align: "left",
-    label: "ผู้สร้าง",
-    sortable: false,
-    field: "createdFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: false,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
+  // {
+  //   name: "createdFullName",
+  //   align: "left",
+  //   label: "ผู้สร้าง",
+  //   sortable: false,
+  //   field: "createdFullName",
+  //   headerStyle: "font-size: 14px",
+  //   style: "font-size: 14px",
+  // },
+  // {
+  //   name: "createdAt",
+  //   align: "left",
+  //   label: "วันที่สร้าง",
+  //   sortable: false,
+  //   field: "createdAt",
+  //   headerStyle: "font-size: 14px",
+  //   style: "font-size: 14px",
+  // },
   {
     name: "lastUpdateFullName",
     align: "left",
-    label: "ผู้แก้ไข",
+    label: "ผู้ดำเนินการ",
     sortable: false,
     field: "lastUpdateFullName",
     headerStyle: "font-size: 14px",
@@ -263,14 +263,15 @@ const columnsHis = ref<QTableProps["columns"]>([
 const visibleColumnsHis = ref<string[]>([
   "dateEmployment",
   "orderEmployment",
-  "createdFullName",
-  "createdAt",
+  // "createdFullName",
+  // "createdAt",
   "lastUpdateFullName",
   "lastUpdatedAt",
 ]);
 const filterHis = ref<string>();
 async function openPopupHistory(id: string) {
   modalHistory.value = true;
+  filterHis.value = "";
   showLoader();
   await http
     .get(config.API.employmentHistoryId(id))
@@ -540,7 +541,7 @@ const paginationHis = ref({
   </q-dialog>
 
   <q-dialog v-model="modalHistory">
-    <q-card style="width: 700px; max-width: 80vw">
+    <q-card style="width: 800px; max-width: 80vw">
       <q-toolbar>
         <q-toolbar-title class="text-subtitle1 text-weight-bold">
           <span style="margin-right: 0"> ประวัติข้อมูลการจ้าง </span>
@@ -557,7 +558,7 @@ const paginationHis = ref({
       </q-toolbar>
       <q-separator />
 
-      <q-card-section class="q-pt-none q-mt-md">
+      <q-card-section class="q-pt-none q-mt-sm">
         <q-toolbar class="q-pa-none">
           <q-space />
           <div class="q-gutter-sm" style="display: flex">