From 14b03c704f29d9061a3d10486e768242b130342a Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 19 Jun 2025 11:58:50 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B8=95=E0=B8=B3?=
 =?UTF-8?q?=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87=20=E0=B9=81?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B8=97=E0=B8=B2=E0=B8=87=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=9A=E0=B8=A3=E0=B8=B4=E0=B8=AB=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=20=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=95=E0=B9=88?=
 =?UTF-8?q?=E0=B8=87=E0=B8=95=E0=B8=B1=E0=B9=89=E0=B8=87-=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99-=E0=B8=A2?=
 =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/06_appointPromoteMain.vue           | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/modules/05_placement/views/06_appointPromoteMain.vue b/src/modules/05_placement/views/06_appointPromoteMain.vue
index 00fa8f0f8..c992b92c2 100644
--- a/src/modules/05_placement/views/06_appointPromoteMain.vue
+++ b/src/modules/05_placement/views/06_appointPromoteMain.vue
@@ -36,6 +36,7 @@ const {
   date2Thai,
   dialogRemove,
   onSearchDataTable,
+  findOrgNameHtml,
 } = useCounterMixin();
 
 const status = ref<string>("");
@@ -146,9 +147,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "organizationName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format: (val, row) => {
-      return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
-    },
+    // format: (val, row) => {
+    //   return `${row.root.position}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
+    // },
   },
   {
     name: "dateOfBirth",
@@ -617,35 +618,37 @@ onMounted(async () => {
                       <div>
                         {{
                           props.row.position !== null ? props.row.position : ""
-                        }}{{
-                          (props.row.posTypeName !== null &&
-                            props.row.posTypeName === "บริหาร") ||
-                          props.row.posTypeName === "อำนวยการ"
-                            ? `${props.row.posTypeName}`
-                            : ""
                         }}{{
                           props.row.posLevelName !== null
                             ? `${props.row.posLevelName}`
                             : ""
                         }}
-                      </div>
-                      <div>
-                        {{ props.row.root !== null ? props.row.root : "-" }}
-                        {{
-                          props.row.rootShortName !== null
-                            ? `(${props.row.rootShortName})`
-                            : ""
-                        }}
-                      </div>
-                      <div>
-                        {{
-                          props.row.nodeName !== null ? props.row.nodeName : ""
-                        }}
                         {{
                           props.row.nodeShortName !== null
                             ? `(${props.row.nodeShortName}${props.row.posMasterNo})`
                             : ""
                         }}
+                        <!-- {{
+                          (props.row.posTypeName !== null &&
+                            props.row.posTypeName === "บริหาร") ||
+                          props.row.posTypeName === "อำนวยการ"
+                            ? `${props.row.posTypeName}`
+                            : ""
+                        }} -->
+                        <div>
+                          {{
+                            props.row.positionExecutive !== null
+                              ? `${props.row.positionExecutive}${
+                                  props.row.positionExecutiveField
+                                    ? ` (${props.row.positionExecutiveField})`
+                                    : ""
+                                }`
+                              : ""
+                          }}
+                        </div>
+                      </div>
+                      <div class="text-html">
+                        {{ findOrgNameHtml(props.row) }}
                       </div>
                     </div>
                   </div>