From 7a3e91603974b2ce21832bf94b2f405da67d2ffd Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Jul 2024 13:20:18 +0700
Subject: [PATCH] fix bug

---
 .../PersonalInformation/04_FamilyNew.vue      |  1 -
 .../15_development/views/EmployeeHistory.vue  | 27 +++++++++++++++----
 src/modules/15_development/views/History.vue  | 26 ++++++++++++++----
 src/modules/15_development/views/MainPage.vue |  4 +--
 4 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyNew.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyNew.vue
index b36510356..65139cc94 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyNew.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/04_FamilyNew.vue
@@ -786,7 +786,6 @@ onMounted(() => {
   <q-dialog v-model="modal" class="dialog" persistent>
     <q-card style="min-width: 80%">
       <q-form @submit.prevent greedy @validation-success="onSubmit(typeForm)">
-        {{ typeForm }} {{ isEdit }}
         <DialogHeader
           :tittle="
             isEdit
diff --git a/src/modules/15_development/views/EmployeeHistory.vue b/src/modules/15_development/views/EmployeeHistory.vue
index 8a55aaaf4..8d5e59ff8 100644
--- a/src/modules/15_development/views/EmployeeHistory.vue
+++ b/src/modules/15_development/views/EmployeeHistory.vue
@@ -36,7 +36,7 @@ const pagination = ref({
 });
 
 const rows = ref<any[]>([]);
-const agencyOp = ref<[]>([]);
+const agencyOp = ref<any[]>([]);
 const itemMenu = ref<ItemsMenu[]>([
   {
     label: "ไฟล์ .xlsx",
@@ -136,11 +136,18 @@ function fetchListOrg() {
   showLoader();
   http
     .get(config.API.developmentHistoryListOrg("employee", formFilter.year))
-    .then((res) => {
+    .then(async (res) => {
       formFilter.root = null;
       rows.value = [];
-      agencyOp.value = res.data.result;
-      getData();
+      const option = [{ name: "ทั้งหมด", id: null }];
+      const optionNew = await res.data.result.map((e: string) => ({
+        name: e,
+        id: e,
+      }));
+      option.push(...optionNew);
+      agencyOp.value = option;
+      // agencyOp.value = res.data.result;
+      await getData();
     })
     .catch((err) => {
       messageError($q, err);
@@ -296,7 +303,17 @@ onMounted(() => {
           option-label="name"
           @update:model-value="(formFilter.page = 1), getData()"
           style="min-width: 150px"
-        />
+          map-options
+          emit-value
+        >
+          <template v-if="formFilter.root" v-slot:append>
+            <q-icon
+              name="cancel"
+              @click.stop.prevent="(formFilter.root = null), fetchListOrg()"
+              class="cursor-pointer"
+            />
+          </template>
+        </q-select>
 
         <!-- <q-btn flat round dense icon="add" color="primary" @click="onAdd()">
           <q-tooltip>เพิ่ม</q-tooltip>
diff --git a/src/modules/15_development/views/History.vue b/src/modules/15_development/views/History.vue
index 75a360c4a..0d7b43f3f 100644
--- a/src/modules/15_development/views/History.vue
+++ b/src/modules/15_development/views/History.vue
@@ -38,7 +38,7 @@ const router = useRouter();
 const store = useDevelopmentDataStore();
 const $q = useQuasar();
 const { showLoader, hideLoader, messageError } = useCounterMixin();
-const agencyOp = ref<[]>([]);
+const agencyOp = ref<any[]>([]);
 const rows = ref<any[]>([]);
 
 const visibleColumns = ref<string[]>([
@@ -149,12 +149,19 @@ function fetchListOrg() {
   showLoader();
   http
     .get(config.API.developmentHistoryListOrg("officer", formFilter.year))
-    .then((res) => {
+    .then(async (res) => {
+      console.log(res);
       formFilter.root = null;
       formFilter.page = 1;
       rows.value = [];
-      agencyOp.value = res.data.result;
-      getData();
+      const option = [{ name: "ทั้งหมด", id: null }];
+      const optionNew = await res.data.result.map((e: string) => ({
+        name: e,
+        id: e,
+      }));
+      option.push(...optionNew);
+      agencyOp.value = option;
+      await getData();
     })
     .catch((err) => {
       messageError($q, err);
@@ -313,7 +320,16 @@ onMounted(() => {
           option-label="name"
           @update:model-value="(formFilter.page = 1), getData()"
           style="min-width: 150px"
-        />
+          map-options
+          emit-value
+        >
+          <template v-if="formFilter.root" v-slot:append>
+            <q-icon
+              name="cancel"
+              @click.stop.prevent="(formFilter.root = null), fetchListOrg()"
+              class="cursor-pointer"
+            /> </template
+        ></q-select>
       </q-toolbar>
       <q-toolbar class="col-4 q-pa-none q-gutter-x-sm">
         <q-space />
diff --git a/src/modules/15_development/views/MainPage.vue b/src/modules/15_development/views/MainPage.vue
index 08cc9a588..2ec86f7e7 100644
--- a/src/modules/15_development/views/MainPage.vue
+++ b/src/modules/15_development/views/MainPage.vue
@@ -401,7 +401,7 @@ onMounted(() => {
 
           <q-space />
 
-          <q-btn
+          <!-- <q-btn
             flat
             round
             dense
@@ -410,7 +410,7 @@ onMounted(() => {
             @click="onDownload"
           >
             <q-tooltip>ดาวน์โหลด</q-tooltip>
-          </q-btn>
+          </q-btn> -->
 
           <q-input
             standout