From b8b812c31988f4d7e7a9074b2b5d88396ed0ab01 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 28 Mar 2025 14:01:29 +0700
Subject: [PATCH] fix Columns Org

---
 .../Help-Government/DialogOrders.vue          | 16 ++++++++--------
 .../components/Other/DialogOrders.vue         | 13 +++++++++----
 .../components/Repatriate/DialogOrders.vue    | 16 +++++++++-------
 .../components/Transfer/DialogOrders.vue      | 17 +++++++++--------
 .../05_placement/views/02_transferMain.vue    | 16 +++++++++-------
 .../views/04_helpGovernmentMain.vue           | 18 +++++++++---------
 .../05_placement/views/05_repatriateMain.vue  | 19 ++++++++++---------
 .../05_placement/views/08_otherMain.vue       | 16 +++++++++-------
 8 files changed, 72 insertions(+), 59 deletions(-)

diff --git a/src/modules/05_placement/components/Help-Government/DialogOrders.vue b/src/modules/05_placement/components/Help-Government/DialogOrders.vue
index fdafad8b9..0a5f5a9f2 100644
--- a/src/modules/05_placement/components/Help-Government/DialogOrders.vue
+++ b/src/modules/05_placement/components/Help-Government/DialogOrders.vue
@@ -22,6 +22,7 @@ const {
   findPosMasterNoOld,
   date2Thai,
   onSearchDataTable,
+  findOrgNameOldHtml,
 } = useCounterMixin();
 
 /** props*/
@@ -108,7 +109,7 @@ const columns2 = ref<QTableProps["columns"]>([
     align: "left",
     label: "สังกัด",
     sortable: true,
-    field: "organization",
+    field: "organizationPositionOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format: (val, row) => findOrgNameOld(row),
@@ -306,14 +307,13 @@ function onSearch() {
                     </div>
 
                     <div
-                      v-else
-                      :class="
-                        col.name === 'organizationPositionOld' ||
-                        col.name === 'organization'
-                          ? 'table_ellipsis'
-                          : ''
-                      "
+                      v-else-if="col.name === 'organizationPositionOld'"
+                      class="text-html"
                     >
+                      {{ findOrgNameOldHtml(props.row) }}
+                    </div>
+
+                    <div v-else>
                       {{
                         col.value == null
                           ? ""
diff --git a/src/modules/05_placement/components/Other/DialogOrders.vue b/src/modules/05_placement/components/Other/DialogOrders.vue
index 98841df99..0e068787a 100644
--- a/src/modules/05_placement/components/Other/DialogOrders.vue
+++ b/src/modules/05_placement/components/Other/DialogOrders.vue
@@ -114,6 +114,9 @@ const columns2 = ref<QTableProps["columns"]>([
     label: "ตำแหน่ง/สังกัดเดิม",
     sortable: true,
     field: "organizationPositionOld",
+    format(val, row) {
+      return row.organizationPositionOld.replace(/\n/g, " ");
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -309,11 +312,13 @@ watch(
                       </div>
 
                       <div
-                        v-else
-                        :class="
-                          col.name === 'affiliation' ? 'table_ellipsis' : ''
-                        "
+                        v-else-if="col.name === 'organizationPositionOld'"
+                        class="text-html"
                       >
+                        {{ props.row.organizationPositionOld ?? '-' }}
+                      </div>
+
+                      <div v-else>
                         {{ col.value ? col.value : "-" }}
                       </div>
                     </q-td>
diff --git a/src/modules/05_placement/components/Repatriate/DialogOrders.vue b/src/modules/05_placement/components/Repatriate/DialogOrders.vue
index 02c4ca9b6..67a155026 100644
--- a/src/modules/05_placement/components/Repatriate/DialogOrders.vue
+++ b/src/modules/05_placement/components/Repatriate/DialogOrders.vue
@@ -108,6 +108,9 @@ const columns2 = ref<QTableProps["columns"]>([
     label: "ตำแหน่ง/สังกัดเดิม",
     sortable: true,
     field: "organizationPositionOld",
+    format(val, row) {
+      return row.organizationPositionOld.replace(/\n/g, " ");
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -261,14 +264,13 @@ watch(
                     </div>
 
                     <div
-                      v-else
-                      :class="
-                        col.name === 'organizationPositionOld' ||
-                        col.name === 'organization'
-                          ? 'table_ellipsis'
-                          : ''
-                      "
+                      v-else-if="col.name === 'organizationPositionOld'"
+                      class="text-html"
                     >
+                      {{ props.row.organizationPositionOld ?? "-" }}
+                    </div>
+
+                    <div v-else>
                       {{ !col.value ? "-" : col.value }}
                     </div>
                   </q-td>
diff --git a/src/modules/05_placement/components/Transfer/DialogOrders.vue b/src/modules/05_placement/components/Transfer/DialogOrders.vue
index eadbc1542..c706a121d 100644
--- a/src/modules/05_placement/components/Transfer/DialogOrders.vue
+++ b/src/modules/05_placement/components/Transfer/DialogOrders.vue
@@ -93,6 +93,9 @@ const columns2 = ref<QTableProps["columns"]>([
     label: "ตำแหน่ง/สังกัดเดิม",
     sortable: true,
     field: "organizationPositionOld",
+    format(val, row) {
+      return row.organizationPositionOld.replace(/\n/g, " ");
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -241,16 +244,14 @@ watch(
                     <div v-if="col.name === 'no'">
                       {{ props.rowIndex + 1 }}
                     </div>
-
                     <div
-                      v-else
-                      :class="
-                        col.name === 'organizationPositionOld' ||
-                        col.name === 'organization'
-                          ? 'table_ellipsis'
-                          : ''
-                      "
+                      v-else-if="col.name === 'organizationPositionOld'"
+                      class="text-html"
                     >
+                      {{ props.row.organizationPositionOld ?? "-" }}
+                    </div>
+
+                    <div v-else>
                       {{ col.value ? col.value : "-" }}
                     </div>
                   </q-td>
diff --git a/src/modules/05_placement/views/02_transferMain.vue b/src/modules/05_placement/views/02_transferMain.vue
index 31567f7f0..ff096a0dd 100644
--- a/src/modules/05_placement/views/02_transferMain.vue
+++ b/src/modules/05_placement/views/02_transferMain.vue
@@ -78,6 +78,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "organizationPositionOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return row.organizationPositionOld.replace(/\n/g, " ");
+    },
   },
   {
     name: "organization",
@@ -303,14 +306,13 @@ onMounted(async () => {
                   </div>
 
                   <div
-                    v-else
-                    :class="
-                      col.name === 'organizationPositionOld' ||
-                      col.name === 'organization'
-                        ? 'table_ellipsis2'
-                        : ''
-                    "
+                    v-else-if="col.name === 'organizationPositionOld'"
+                    class="text-html"
                   >
+                    {{ props.row.organizationPositionOld ?? "-" }}
+                  </div>
+
+                  <div v-else>
                     {{
                       col.value == null ? "" : col.value == "" ? "-" : col.value
                     }}
diff --git a/src/modules/05_placement/views/04_helpGovernmentMain.vue b/src/modules/05_placement/views/04_helpGovernmentMain.vue
index ee3a0efa5..8ce212b18 100644
--- a/src/modules/05_placement/views/04_helpGovernmentMain.vue
+++ b/src/modules/05_placement/views/04_helpGovernmentMain.vue
@@ -31,6 +31,7 @@ const {
   findOrgNameOld,
   findPosMasterNoOld,
   onSearchDataTable,
+  findOrgNameOldHtml,
 } = mixin;
 
 /** Table*/
@@ -111,8 +112,8 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "สังกัด",
     sortable: true,
-    field: "organization",
-    headerStyle: "font-size: 14px",
+    field: "organizationPositionOld",
+    headerStyle: "font-size: 14px;min-width: 280px",
     style: "font-size: 14px",
     format: (val, row) => findOrgNameOld(row),
   },
@@ -405,14 +406,13 @@ onMounted(async () => {
                   </div>
 
                   <div
-                    v-else
-                    :class="
-                      col.name === 'organizationPositionOld' ||
-                      col.name === 'organization'
-                        ? 'table_ellipsis'
-                        : ''
-                    "
+                    v-else-if="col.name === 'organizationPositionOld'"
+                    class="text-html"
                   >
+                    {{ findOrgNameOldHtml(props.row) }}
+                  </div>
+
+                  <div v-else>
                     {{
                       col.value == null ? "" : col.value == "" ? "-" : col.value
                     }}
diff --git a/src/modules/05_placement/views/05_repatriateMain.vue b/src/modules/05_placement/views/05_repatriateMain.vue
index 772e1932c..c40231639 100644
--- a/src/modules/05_placement/views/05_repatriateMain.vue
+++ b/src/modules/05_placement/views/05_repatriateMain.vue
@@ -101,6 +101,9 @@ const columns = ref<QTableProps["columns"]>([
     label: "ตำแหน่ง/สังกัดเดิม",
     sortable: true,
     field: "organizationPositionOld",
+    format(val, row) {
+      return row.organizationPositionOld.replace(/\n/g, " ");
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -154,7 +157,7 @@ function openDetail(id: string) {
 async function getData() {
   showLoader();
   await http
-    .get(config.API.repatriationMain()+`?status=${status.value}`)
+    .get(config.API.repatriationMain() + `?status=${status.value}`)
     .then(async (res) => {
       const data = await res.data.result;
       rows.value = data;
@@ -363,16 +366,14 @@ onMounted(async () => {
                   <div v-if="col.name === 'no'">
                     {{ props.rowIndex + 1 }}
                   </div>
-
                   <div
-                    v-else
-                    :class="
-                      col.name === 'organizationPositionOld' ||
-                      col.name === 'organization'
-                        ? 'table_ellipsis2'
-                        : ''
-                    "
+                    v-else-if="col.name === 'organizationPositionOld'"
+                    class="text-html"
                   >
+                    {{ props.row.organizationPositionOld ?? "-" }}
+                  </div>
+
+                  <div v-else>
                     {{ !col.value ? "-" : col.value }}
                   </div>
                 </q-td>
diff --git a/src/modules/05_placement/views/08_otherMain.vue b/src/modules/05_placement/views/08_otherMain.vue
index 9d9895cd9..1b02d73a9 100644
--- a/src/modules/05_placement/views/08_otherMain.vue
+++ b/src/modules/05_placement/views/08_otherMain.vue
@@ -99,6 +99,9 @@ const columns = ref<QTableProps["columns"]>([
     label: "ตำแหน่ง/สังกัดเดิม",
     sortable: true,
     field: "organizationPositionOld",
+    format(val, row) {
+      return row.organizationPositionOld.replace(/\n/g, " ");
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -355,14 +358,13 @@ onMounted(() => {
                   </div>
 
                   <div
-                    v-else
-                    :class="
-                      col.name === 'organizationPositionOld' ||
-                      col.name === 'organization'
-                        ? 'table_ellipsis2'
-                        : ''
-                    "
+                    v-else-if="col.name === 'organizationPositionOld'"
+                    class="text-html"
                   >
+                    {{ props.row.organizationPositionOld ?? "-" }}
+                  </div>
+
+                  <div v-else>
                     {{ col.value ? col.value : "-" }}
                   </div>
                 </q-td>