แก้ไขการแสดงผลบรรจุ เมนูอื่นๆ

src/modules/05_placement/views/08_otherMain.vue

@@ -30,6 +30,7 @@ const {
   date2Thai,
   dialogRemove,
   onSearchDataTable,
+  findChildNameHtml,
 } = useCounterMixin();
 
 const modal = ref<boolean>(false);
@@ -130,7 +131,7 @@ const columns = ref<QTableProps["columns"]>([
     sortable: true,
     field: "organizationPositionReturn",
     format(val, row) {
-      return row.organizationPositionOld.replace(/\n/g, " ");
+      return row.organizationPositionReturn.replace(/\n/g, " ");
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -480,29 +481,27 @@ onMounted(() => {
                   <div v-else-if="col.name === 'organizationPositionReturn'">
                     <div class="col-4">
                       <div>
-                        {{
-                          props.row.position !== null ? props.row.position : ""
-                        }}{{
+                        <!-- {{
                           (props.row.posTypeName !== null &&
                             props.row.posTypeName === "บริหาร") ||
                           props.row.posTypeName === "อำนวยการ"
                             ? `${props.row.posTypeName}`
                             : ""
+                        }} -->
+                        {{
+                          props.row.position !== null ? props.row.position : ""
                         }}{{
                           props.row.posLevelName !== null
                             ? `${props.row.posLevelName}`
                             : ""
                         }}
-                      </div>
-                      <div>
-                        {{ props.row.root !== null ? props.row.root : "-" }}
                         {{
-                          props.row.rootShortName !== null
-                            ? `(${props.row.rootShortName})`
+                          props.row.nodeShortName !== null
+                            ? `(${props.row.nodeShortName}${props.row.posMasterNo})`
                             : ""
                         }}
                       </div>
-                      <div>
+                      <!-- <div>
                         {{
                           props.row.nodeName !== null ? props.row.nodeName : ""
                         }}
@@ -511,6 +510,9 @@ onMounted(() => {
                             ? `(${props.row.nodeShortName}${props.row.posMasterNo})`
                             : ""
                         }}
+                      </div> -->
+                      <div class="text-html">
+                        {{ findChildNameHtml(props.row) }}
                       </div>
                     </div>
                   </div>