From 340cfae7043207afb5efe2411943a0a4994001bb Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Wed, 31 Jan 2024 18:06:23 +0700
Subject: [PATCH] updated

---
 .../components/DialogFormAgency.vue              |  3 ++-
 .../components/StructureDetail.vue               | 16 ++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogFormAgency.vue b/src/modules/02_organizationalNew/components/DialogFormAgency.vue
index f6ecc0d64..9fe36ba6b 100644
--- a/src/modules/02_organizationalNew/components/DialogFormAgency.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormAgency.vue
@@ -166,7 +166,7 @@ function onSubmit() {
           )
           .then((res) => {
             console.log(res);
-            props.edit?.(props.dataNode?.orgTreeId, type, body);
+            props.edit?.(props.dataNode?.orgTreeId, type, body, props.dataNode?.orgRootCode);
             success($q, "บันทึกข้อมูลสำเร็จ");
           })
           .catch((err) => {
@@ -235,6 +235,7 @@ const tittleName = computed(() => {
   return name;
 });
 </script>
+
 <template>
   <template>
     <q-dialog v-model="props.modal" persistent>
diff --git a/src/modules/02_organizationalNew/components/StructureDetail.vue b/src/modules/02_organizationalNew/components/StructureDetail.vue
index 06b4be766..b57924d74 100644
--- a/src/modules/02_organizationalNew/components/StructureDetail.vue
+++ b/src/modules/02_organizationalNew/components/StructureDetail.vue
@@ -39,14 +39,14 @@ async function fetchDetailTree(id: string, type: string) {
     .then((res) => {
       const data = res.data.result;
       const range = data[`org${type}Rank`];
-      formData.orgName =
-        range == "DEPARTMENT"
-          ? data[`org${type}Name`] + ` (${data[`org${type}ShortName`]})`
-          : "-";
-      formData.agencyName =
-        range != "DEPARTMENT"
-          ? data[`org${type}Name`] + ` (${data[`org${type}ShortName`]})`
-          : "-";
+      formData.orgName = data[`org${type}orgRootName`] ? data[`org${type}orgRootName`] : '-';
+        // range == "DEPARTMENT"
+        //   ? data[`org${type}Name`] + ` (${data[`org${type}ShortName`]})`
+        //   : "-";
+      formData.agencyName = data[`org${type}orgName`] ? data[`org${type}orgName`] : '-';
+        // range != "DEPARTMENT"
+        //   ? data[`org${type}Name`] + ` (${data[`org${type}ShortName`]})`
+        //   : "-";
       formData.orgType = range != "DEPARTMENT" ? "ส่วนราชการ" : "หน่วยงาน";
       formData.orgLevel = store.convertType(range);
       formData.status =