fixing column บรรจุ แต่งตั้ง ย้าย

src/modules/05_placement/components/Other/Detail.vue

@@ -258,9 +258,9 @@ onMounted(async () => {
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="positionTypeOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]"
+                :rules="[(val) => !!val || `${'กรุณากรอกประเภทตำแหน่ง'}`]"
                 hide-bottom-space
-                :label="`${'ตำแหน่งประเภท'}`"
+                :label="`${'ประเภทตำแหน่ง'}`"
               />
             </div>
           </div>
@@ -274,9 +274,9 @@ onMounted(async () => {
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="positionLevelOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกระดับ'}`]"
+                :rules="[(val) => !!val || `${'กรุณากรอกระดับตำแหน่ง'}`]"
                 hide-bottom-space
-                :label="`${'ระดับ'}`"
+                :label="`${'ระดับตำแหน่ง'}`"
               />
             </div>
           </div>

src/modules/05_placement/components/Other/Dialogbody.vue

@@ -43,9 +43,8 @@ const props = defineProps({
 const visibleColumns2 = ref<string[]>([
   "no",
   "fullname",
-  "position",
   "positionLevel",
-  "affiliation",
+  "organizationPositionOld",
   "createdAt",
   "status",
 ]);
@@ -71,15 +70,6 @@ const columns2 = ref<QTableProps["columns"]>([
       return `${row.prefix}${row.firstName} ${row.lastName}`;
     },
   },
-  {
-    name: "position",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    sortable: true,
-    field: "position",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "positionLevel",
     align: "left",
@@ -90,27 +80,24 @@ const columns2 = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
     format(val, row) {
       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})`;
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
       } else name = "-";
       return name;
     },
   },
   {
-    name: "affiliation",
+    name: "organizationPositionOld",
     align: "left",
-    label: "สังกัด",
+    label: "ตำแหน่งและหน่วยงานเดิม",
     sortable: true,
-    field: "affiliation",
+    field: "organizationPositionOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format(val, row) {
-      return findOrgName(row);
-    },
   },
   {
     name: "createdAt",

src/modules/05_placement/components/Other/Main.vue

@@ -47,9 +47,8 @@ const filterRef = ref<any>(null);
 const visibleColumns = ref<string[]>([
   "no",
   "fullname",
-  "position",
   "positionLevel",
-  "affiliation",
+  "organizationPositionOld",
   "createdAt",
   "status",
 ]);
@@ -75,15 +74,6 @@ const columns = ref<QTableProps["columns"]>([
       return `${row.prefix}${row.firstName} ${row.lastName}`;
     },
   },
-  {
-    name: "position",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    sortable: true,
-    field: "position",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "positionLevel",
     align: "left",
@@ -94,27 +84,24 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
     format(val, row) {
       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})`;
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
       } else name = "-";
       return name;
     },
   },
   {
-    name: "affiliation",
+    name: "organizationPositionOld",
     align: "left",
-    label: "สังกัด",
+    label: "ตำแหน่งและหน่วยงานเดิม",
     sortable: true,
-    field: "affiliation",
+    field: "organizationPositionOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format(val, row) {
-      return findOrgName(row);
-    },
   },
   {
     name: "createdAt",

src/modules/05_placement/components/Other/OtherModal.vue

@@ -253,7 +253,7 @@ const positionPathSideOptions = ref<Object[]>([
     value: "",
   },
 ]);
-// ตำแหน่งประเภท
+// ประเภทตำแหน่ง
 const positionTypeOptions = ref<Object[]>([
   {
     label: "",