บรรจุ => รายการ อื่นๆ

src/modules/05_placement/components/helpgovernment/governmentDetail.vue

@@ -28,6 +28,7 @@ const {
   showLoader,
   hideLoader,
   success,
+  findOrgName,
 } = mixin;
 
 const myForm = ref<QForm | null>(null);
@@ -54,7 +55,9 @@ const getData = () => {
       const data = res.data.result;
       dataProfile.value = res.data.result as unknown as DataProfile;
       fullname.value = `${data.prefix}${data.firstName} ${data.lastName}`;
-      organizationPositionOld.value = data.organizationPositionOld;
+      organizationPositionOld.value = data.organizationPositionOld
+        ? data.organizationPositionOld
+        : findOrgName(data);
       organization.value = data.organization;
       dateStart.value = data.dateStart;
       dateEnd.value = data.dateEnd;

src/modules/05_placement/components/helpgovernment/mainHelp.vue

@@ -88,7 +88,15 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     format(val, row) {
-      return `${row.posTypeName} (${row.posLevelName})`;
+      let name = "";
+      if (row.posTypeName && row.posLevelName) {
+        name = `${row.posTypeName} (${row.posLevelName})`;
+      } else if (row.posTypeName) {
+        name = `${row.posTypeName}`;
+      } else if (row.posLevelName) {
+        name = `(${row.posLevelName})`;
+      } else name = "-";
+      return name;
     },
   },
   {