Merge branch 'develop' into devTee

src/modules/04_registryPerson/components/TableView.vue

@@ -75,6 +75,9 @@ const columns = ref<QTableProps["columns"]>([
     label: empType.value === "officer" ? "เลขที่ตำแหน่ง" : "ตำแหน่งเลขที่",
     sortable: false,
     field: "posNo",
+    format(val, row) {
+      return `${row.orgRootShortName} ${val}`
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -442,7 +445,7 @@ onMounted(() => {
         </q-td>
       </q-tr>
     </template>
-    <template v-slot:item="props" v-else>
+    <template v-slot:item="props" vc-else>
       <div class="col-xs-12 col-sm-4 col-md-3">
         <q-card flat bordered>
           <q-card-section class="text-center q-pb-none">
@@ -500,7 +503,7 @@ onMounted(() => {
                 <div class="text-subtitle2 text-black q-ml-sm">
                   {{
                     props.row.posNo && props.row.posNo != "undefined"
-                      ? props.row.posNo
+                      ? `${props.row.orgRootShortName} ${props.row.posNo}`
                       : "-"
                   }}
                 </div>