From 42e15b5d7ef925f066f2bfb36f8930a8ce480def Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Thu, 4 Apr 2024 15:31:16 +0700
Subject: [PATCH] no message

---
 src/modules/15_development/components/history/AddPage.vue | 1 +
 .../15_development/components/history/DialogGov.vue       | 1 +
 .../15_development/components/history/DialogProject.vue   | 1 +
 .../15_development/components/historyEmployee/AddPage.vue | 2 +-
 .../components/historyEmployee/DialogGov.vue              | 1 +
 .../components/historyEmployee/DialogProject.vue          | 1 +
 src/modules/15_development/views/EmployeeHistory.vue      | 8 +++-----
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/modules/15_development/components/history/AddPage.vue b/src/modules/15_development/components/history/AddPage.vue
index dde036663..089d4479b 100644
--- a/src/modules/15_development/components/history/AddPage.vue
+++ b/src/modules/15_development/components/history/AddPage.vue
@@ -329,6 +329,7 @@ onMounted(()=>{
                 <q-input
                   outlined
                   dense
+                  :class="getClass()"
                   hide-bottom-space
                   :model-value="dateOrder != null ? date2Thai(dateOrder) : null"
                   :rules="[(val:string) => !!val || `${'กรุณากรอกคำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'}`,]"
diff --git a/src/modules/15_development/components/history/DialogGov.vue b/src/modules/15_development/components/history/DialogGov.vue
index 839952fc3..a078ff67d 100644
--- a/src/modules/15_development/components/history/DialogGov.vue
+++ b/src/modules/15_development/components/history/DialogGov.vue
@@ -167,6 +167,7 @@ function closeDialog() {
   modal.value = false;
   rows.value = [];
   selected.value = [];
+  inputSearch.value = ''
 }
 
 /** class */
diff --git a/src/modules/15_development/components/history/DialogProject.vue b/src/modules/15_development/components/history/DialogProject.vue
index f65460206..034e2582a 100644
--- a/src/modules/15_development/components/history/DialogProject.vue
+++ b/src/modules/15_development/components/history/DialogProject.vue
@@ -139,6 +139,7 @@ function closeDialog() {
   modal.value = false;
   rows.value = [];
   selected.value = [];
+  inputSearch.value = ''
 }
 
 /** class */
diff --git a/src/modules/15_development/components/historyEmployee/AddPage.vue b/src/modules/15_development/components/historyEmployee/AddPage.vue
index a1cc81e69..e8530b16e 100644
--- a/src/modules/15_development/components/historyEmployee/AddPage.vue
+++ b/src/modules/15_development/components/historyEmployee/AddPage.vue
@@ -117,7 +117,7 @@ function onSubmit() {
     http[store.statusEdit ? "put" : "post"](url, body)
       .then((res) => {
         console.log(res);
-        router.push(`/development/history`);
+        router.push(`/development/employee-history`);
       })
       .catch((e) => {
         messageError($q, e);
diff --git a/src/modules/15_development/components/historyEmployee/DialogGov.vue b/src/modules/15_development/components/historyEmployee/DialogGov.vue
index 3be849189..3ad749e65 100644
--- a/src/modules/15_development/components/historyEmployee/DialogGov.vue
+++ b/src/modules/15_development/components/historyEmployee/DialogGov.vue
@@ -158,6 +158,7 @@ function closeDialog() {
   modal.value = false;
   rows.value = [];
   selected.value = [];
+  inputSearch.value = ''
 }
 
 /** class */
diff --git a/src/modules/15_development/components/historyEmployee/DialogProject.vue b/src/modules/15_development/components/historyEmployee/DialogProject.vue
index 8d2403daa..4b9b38c43 100644
--- a/src/modules/15_development/components/historyEmployee/DialogProject.vue
+++ b/src/modules/15_development/components/historyEmployee/DialogProject.vue
@@ -132,6 +132,7 @@ function closeDialog() {
   modal.value = false;
   rows.value = [];
   selected.value = [];
+  inputSearch.value = "";
 }
 
 /** class */
diff --git a/src/modules/15_development/views/EmployeeHistory.vue b/src/modules/15_development/views/EmployeeHistory.vue
index e1f2243a0..022e2ebbb 100644
--- a/src/modules/15_development/views/EmployeeHistory.vue
+++ b/src/modules/15_development/views/EmployeeHistory.vue
@@ -153,15 +153,13 @@ function getData() {
       rows.value = data.map((item: any) => ({
         id: item.id ? item.id : null,
         citizenId: item.citizenId ? item.citizenId : null,
-        name: item.firstName
-          ? `${item.prefix}${item.firstName} ${item.lastName}`
-          : null,
+        name: item.fullName ? item.fullName : null,
         prefix: item.prefix ? item.prefix : null,
         firstName: item.firstName ? item.firstName : null,
         lastName: item.lastName ? item.lastName : null,
         position: item.position ? item.position : null,
-        type: item.type ? item.type : null,
-        level: item.level ? item.level : null,
+        type: item.posType ? item.posType : null,
+        level: item.posLevel ? item.posLevel : null,
         positionSide: item.posExecutive ? item.posExecutive : null,
         projectName: item.projectName ? item.projectName : null,
       }));