From 3c6a4df8aa7466d6843514e508f341bf65174d81 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 19 Feb 2025 14:35:38 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7=E0=B9=88?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=AF=20?=
 =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=20=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=96=E0=B8=B2=E0=B8=99=E0=B8=A0=E0=B8=B2=E0=B8=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/registry/api.registry.ts              |  2 +-
 .../07_insignia/components/2_Manage/Tab1.vue  | 67 +++++++++++++------
 2 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/src/api/registry/api.registry.ts b/src/api/registry/api.registry.ts
index 60bf53e6a..62ecb17e9 100644
--- a/src/api/registry/api.registry.ts
+++ b/src/api/registry/api.registry.ts
@@ -6,7 +6,7 @@ const metadata = `${env.API_URI}/org/metadata/`;
 
 export default {
   registryNew: (type: string) => `${registryNew}${type}`,
-  registryNewOtherSystem: (type: string) => `${registryNew}/otherSystem${type}`,
+  registryNewOtherSystem: (type: string) => `${registryNew}${type}/otherSystem`,
   registryNewByProfileId: (profileId: string, type: string) =>
     `${registryNew}${type}/${profileId}`,
 
diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue
index 8e088e2fc..65cf5d6ab 100644
--- a/src/modules/07_insignia/components/2_Manage/Tab1.vue
+++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue
@@ -90,7 +90,11 @@ const dialogWarn = ref<boolean>(false);
 const checkboxData = ref<CheckboxData[]>([]);
 
 const filterOrganizationOP = ref<OptionData[]>([]);
-
+const employeeType = ref<string>("officer");
+const employeeTypeOption = ref<OptionData[]>([
+  { id: "officer", name: "ข้าราชการ กทม. สามัญ" },
+  { id: "employee", name: "ลูกจ้างประจำ กทม." },
+]);
 /** หัวตาราง*/
 const visibleColumns = ref<string[]>([
   "no",
@@ -360,9 +364,14 @@ const filterOption = ref<OptionData[]>([
 async function fecthlistperson() {
   showLoader();
   http
-    .get(config.API.registryNewOtherSystem(""), {
-      params: { ...formFilter, nodeId: organization.value },
-    })
+    .get(
+      config.API.registryNewOtherSystem(
+        employeeType.value == "officer" ? `` : `-employee`
+      ),
+      {
+        params: { ...formFilter, nodeId: organization.value },
+      }
+    )
     .then((res) => {
       maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize);
       total.value = res.data.result.total;
@@ -1370,7 +1379,7 @@ onMounted(async () => {
   </div>
   <!-- add -->
   <q-dialog v-model="modalAdd" persistent>
-    <q-card style="width: 900px; max-width: 80vw">
+    <q-card style="width: 90vw; max-width: 80vw">
       <DialogHeader tittle="เพิ่มรายชื่อ" :close="onCloseModalAdd" />
 
       <q-separator />
@@ -1379,9 +1388,23 @@ onMounted(async () => {
         <div class="row col-12 q-col-gutter-sm">
           <div class="col-xs-12 col-sm-7">
             <q-card flat bordered class="fit q-pa-sm">
-              <q-toolbar style="padding: 0">
-                <q-space />
-                <div class="row q-col-gutter-sm">
+              <div class="row q-col-gutter-sm q-mb-sm">
+                <div class="col-3">
+                  <q-select
+                    outlined
+                    dense
+                    v-model="employeeType"
+                    :options="employeeTypeOption"
+                    label="สภานภาพ"
+                    emit-value
+                    map-options
+                    option-label="name"
+                    option-value="id"
+                    @update:model-value="clearForm(), fecthlistperson()"
+                  >
+                  </q-select>
+                </div>
+                <div class="col-3">
                   <q-select
                     dense
                     outlined
@@ -1394,20 +1417,22 @@ onMounted(async () => {
                     emit-value
                     @update:model-value="formFilter.searchKeyword = ''"
                   />
-                  <q-input
-                    borderless
-                    outlined
-                    dense
-                    placeholder="ค้นหา"
-                    v-model="formFilter.searchKeyword"
-                    @keydown.enter="(formFilter.page = 1), fecthlistperson()"
-                  >
-                    <template v-slot:append>
-                      <q-icon name="search" />
-                    </template>
-                  </q-input>
                 </div>
-              </q-toolbar>
+                <q-space />
+                <q-input
+                  borderless
+                  outlined
+                  dense
+                  placeholder="ค้นหา"
+                  v-model="formFilter.searchKeyword"
+                  @keydown.enter="(formFilter.page = 1), fecthlistperson()"
+                >
+                  <template v-slot:append>
+                    <q-icon name="search" />
+                  </template>
+                </q-input>
+              </div>
+
               <d-table
                 flat
                 bordered