diff --git a/src/modules/15_development/components/BasicInfo.vue b/src/modules/15_development/components/BasicInfo.vue
index 90022418a..ab7f6ee68 100644
--- a/src/modules/15_development/components/BasicInfo.vue
+++ b/src/modules/15_development/components/BasicInfo.vue
@@ -4,6 +4,8 @@ import { useQuasar } from "quasar";
 
 import type { FormBasicinfo } from "@/modules/15_development/interface/request/Main";
 
+import DialogSelectAgency from "@/modules/15_development/components/DialogSelectAgency.vue";
+
 import { useCounterMixin } from "@/stores/mixin";
 
 const $q = useQuasar();
@@ -11,7 +13,7 @@ const { showLoader, hideLoader, dialogConfirm } = useCounterMixin();
 
 const formData = reactive<FormBasicinfo>({
   year: new Date().getFullYear(),
-  org: "สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานครกองบริหารทั้วไป",
+  org: "",
   projectName: "",
   reason: "",
   objective: "",
@@ -25,6 +27,14 @@ function onSubmit() {
   dialogConfirm($q, () => {});
 }
 
+const modalDialogSelect = ref<boolean>(false);
+function selectAgency() {
+  modalDialogSelect.value = true;
+}
+function updateAgency(name: string) {
+  formData.org = name;
+}
+
 onMounted(() => {
   console.log("ข้อมูลเบื้องต้น");
 });
@@ -66,14 +76,14 @@ onMounted(() => {
         </datepicker>
       </div>
       <div class="col-xs-10 col-sm-10 col-md-10">
-        <q-select
+        <q-input
           dense
           outlined
           v-model="formData.org"
-          :options="options"
           label="ชื่อหน่วยงานที่รับผิดชอบ"
           hide-bottom-space
           lazy-rules
+          @click="selectAgency"
           :rules="[
             (val:string) =>
               !!val || `${'กรุณาเลือกหน่วยงานที่รับผิดชอบ'}`,
@@ -143,6 +153,11 @@ onMounted(() => {
       </q-btn>
     </div>
   </q-form>
+
+  <DialogSelectAgency
+    v-model:modal="modalDialogSelect"
+    @update:updateAgency="updateAgency"
+  />
 </template>
 
 <style scoped></style>
diff --git a/src/modules/15_development/components/DialogSelectAgency.vue b/src/modules/15_development/components/DialogSelectAgency.vue
new file mode 100644
index 000000000..516fc1855
--- /dev/null
+++ b/src/modules/15_development/components/DialogSelectAgency.vue
@@ -0,0 +1,151 @@
+<script setup lang="ts">
+import { computed, ref, reactive, watch } from "vue";
+import { useQuasar } from "quasar";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+import DialogHeader from "@/components/DialogHeader.vue";
+
+import { useCounterMixin } from "@/stores/mixin";
+
+const $q = useQuasar();
+const {
+  date2Thai,
+  dialogConfirm,
+  showLoader,
+  hideLoader,
+  messageError,
+  success,
+  dialogRemove,
+} = useCounterMixin();
+
+const modal = defineModel<boolean>("modal", { default: false });
+
+const emit = defineEmits(["update:updateAgency"]);
+const node = ref<any>([]);
+const expanded = ref<any>([]);
+const ticked = ref<any>([]);
+
+function closeDialog() {
+  modal.value = false;
+  ticked.value = [];
+  expanded.value = [];
+}
+function fetchActive() {
+  showLoader();
+  http
+    .get(config.API.activeOrganization)
+    .then((res) => {
+      const data = res.data.result;
+      fetchTree(data.activeId);
+    })
+    .catch((err) => {
+      messageError($q, err);
+      hideLoader();
+    });
+}
+
+async function fetchTree(id: string) {
+  showLoader();
+  http
+    .get(config.API.orgByid(id.toString()))
+    .then((res) => {
+      const data = res.data.result;
+      node.value = data;
+    })
+    .catch((err) => {
+      messageError($q, err);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+function updateTicked(val: any) {
+  console.log(expanded.value);
+
+  ticked.value = [];
+  ticked.value.push(val[val.length - 1]);
+}
+
+function onSubmit() {
+  dialogConfirm($q, () => {
+    emit("update:updateAgency", ticked.value[0]);
+    closeDialog();
+  });
+}
+
+function splitWords(sentence: string) {
+  // ใช้ฟังก์ชั่น split เพื่อแยกข้อความด้วยเครื่องหมาย '/'
+  const words = sentence.split("/");
+  console.log(words);
+
+  // ticked.value = sentence;
+  // expanded.value = words.reverse();
+}
+
+watch(
+  () => modal.value,
+  () => {
+    modal.value && fetchActive();
+    // splitWords("ฝ่ายบริหารทั่วไป/กองโครงสร้างและอัตรากำลัง/สำนักงาน ก.ก.");
+  }
+);
+</script>
+<template>
+  <q-dialog v-model="modal">
+    <q-card style="width: 600px; max-width: 80vw">
+      <DialogHeader
+        :tittle="'เลือกหน่วยงานที่รับผิดชอบ'"
+        :close="closeDialog"
+      />
+      <q-separator />
+
+      <q-card-section class="q-pt-none scroll" style="max-height: 65vh">
+        <q-tree
+          class="q-pa-sm q-gutter-sm"
+          dense
+          :nodes="node"
+          node-key="orgName"
+          label-key="labelName"
+          v-model:expanded="expanded"
+          tick-strategy="strict"
+          v-model:ticked="ticked"
+          @update:ticked="updateTicked"
+        >
+          <template v-slot:default-header="prop">
+            <q-item
+              clickable
+              active-class="my-list-link text-primary text-weight-medium"
+              class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
+            >
+              <div>
+                <div class="text-weight-medium">
+                  {{ prop.node.orgTreeName }}
+                </div>
+                <div class="text-weight-light text-grey-8">
+                  {{ prop.node.orgCode == null ? null : prop.node.orgCode }}
+                  {{
+                    prop.node.orgTreeShortName == null
+                      ? null
+                      : prop.node.orgTreeShortName
+                  }}
+                </div>
+              </div>
+            </q-item>
+          </template>
+        </q-tree>
+      </q-card-section>
+
+      <q-separator />
+
+      <q-card-actions align="right" class="bg-white text-teal">
+        <q-btn dense unelevated label="บันทึก" color="public" @click="onSubmit">
+          <q-tooltip>บันทึกข้อมูล</q-tooltip>
+        </q-btn>
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+</template>
+
+<style scoped></style>