From 75de27566880704f71cc809798c9110005ea96a5 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Mon, 19 Feb 2024 12:20:07 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20bug=20=E0=B9=82?=
 =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=87=E0=B8=AD=E0=B8=B1=E0=B8=95=E0=B8=A3=E0=B8=B2=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../02_organizationalNew/components/DialogFormPosition.vue    | 3 ++-
 src/modules/02_organizationalNew/components/TreeMain.vue      | 3 +++
 src/modules/02_organizationalNew/components/TreeTable.vue     | 4 +++-
 src/modules/02_organizationalNew/components/TreeView.vue      | 3 +++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
index 8f3be1378..cad02c873 100644
--- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue
+++ b/src/modules/02_organizationalNew/components/DialogFormPosition.vue
@@ -34,6 +34,7 @@ const props = defineProps({
   rowId: { type: String, default: "" },
   fetchDataTable: Function,
   getSummary: Function,
+  shortName: {type: String, required: true}
 });
 
 const modalAdd = ref<boolean>(false);
@@ -105,7 +106,7 @@ const positionExecutiveFieldRef = ref<Object | null>(null);
 const positionAreaRef = ref<Object | null>(null);
 
 const formData = reactive<FormDataPosition>({
-  shortName: "สกจ.",
+  shortName: props.shortName,
   prefixNo: "",
   positionNo: "",
   suffixNo: "",
diff --git a/src/modules/02_organizationalNew/components/TreeMain.vue b/src/modules/02_organizationalNew/components/TreeMain.vue
index 6c77f9f81..739201d7a 100644
--- a/src/modules/02_organizationalNew/components/TreeMain.vue
+++ b/src/modules/02_organizationalNew/components/TreeMain.vue
@@ -34,6 +34,7 @@ const {
 /** props*/
 const nodeTEST = defineModel<OrgTree[]>("nodeTree", { default: [] });
 const nodeId = defineModel<string>("nodeId", { required: true });
+const shortName = defineModel<string>("shortName", { required: true });
 const props = defineProps({
   fetchDataTree: {
     type: Function,
@@ -102,6 +103,8 @@ const orgId = ref<string>("");
  * @param data ข่อมูล Tree
  */
 function updateSelected(data: DataTree) {
+  shortName.value = data.orgTreeShortName;
+
   if (!store.treeId || store.treeId != data.orgTreeId) {
     store.treeId = data.orgTreeId;
     store.level = data.orgLevel;
diff --git a/src/modules/02_organizationalNew/components/TreeTable.vue b/src/modules/02_organizationalNew/components/TreeTable.vue
index f5920b4cf..e38f2f398 100644
--- a/src/modules/02_organizationalNew/components/TreeTable.vue
+++ b/src/modules/02_organizationalNew/components/TreeTable.vue
@@ -43,6 +43,7 @@ const treeId = defineModel<string>("treeId", { required: true });
 const reqMaster = defineModel<FilterMaster>("reqMaster", { required: true });
 const totalPage = defineModel<number>("totalPage", { required: true });
 const posMaster = defineModel<PosMaster2[]>("posMaster", { required: true });
+// const shortName = defineModel<string>("shortName", { required: true });
 const props = defineProps({
   filterKeyword: { type: Function, require: true, default: () => {} },
   fetchDataTable: {
@@ -50,6 +51,7 @@ const props = defineProps({
     require: true,
     default: () => {},
   },
+  shortName: { type: String, required: true },
   fetchDataTree: {
     type: Function,
     require: true,
@@ -757,6 +759,7 @@ async function onClickDownloadReport(val: string, name: string) {
   <!-- อัตรากำลัง -->
   <DialogFormPosotion
     :modal="dialogPosition"
+    :shortName="shortName"
     :close="onClickPosition"
     :orgLevel="orgLevel"
     :treeId="treeId"
@@ -830,5 +833,4 @@ async function onClickDownloadReport(val: string, name: string) {
     padding: 0px;
   }
 }
-
 </style>
diff --git a/src/modules/02_organizationalNew/components/TreeView.vue b/src/modules/02_organizationalNew/components/TreeView.vue
index da5977909..bbe910329 100644
--- a/src/modules/02_organizationalNew/components/TreeView.vue
+++ b/src/modules/02_organizationalNew/components/TreeView.vue
@@ -50,6 +50,7 @@ const reqMaster = reactive<FilterMaster>({
 const totalPage = ref<number>(1);
 const action1 = ref<boolean>(false);
 const posMaster = ref<PosMaster2[]>([]);
+const shortName = ref<string>("");
 
 /**
  * function fetch ข้อมูลของ Tree
@@ -225,6 +226,7 @@ watch(
         <div class="col-12 row no-wrap bg-grey-1">
           <TreeMain
             v-model:nodeTree="nodeTree"
+            v-model:shortName="shortName"
             v-model:nodeId="nodeId"
             :fetchDataTree="fetchDataTree"
             :fetchDataTable="fetchDataTable"
@@ -302,6 +304,7 @@ watch(
                 v-model:reqMaster="reqMaster"
                 v-model:totalPage="totalPage"
                 v-model:posMaster="posMaster"
+                :shortName="shortName"
                 :mainTree="mainTree"
                 :fetchDataTable="fetchDataTable"
                 :filterKeyword="filterKeyword"