ปรับ ออกคำสั่ง รายการอื่นๆ

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

@@ -45,9 +45,10 @@ const filterKeyword2 = ref<string>(""); //คำค้นหารายกา
 const visibleColumns = ref<string[]>([
   "no",
   "fullname",
-  "organizationPositionReturn",
+  "positionNumberOld",
   "positionLevel",
   "organizationPositionOld",
+  "organizationPositionReturn",
   "createdAt",
   "status",
 ]);
@@ -77,21 +78,22 @@ const columns = ref<QTableProps["columns"]>([
   },
 
   {
-    name: "organizationPositionReturn",
+    name: "positionNumberOld",
     align: "left",
-    label: "ตำแหน่ง/หน่วยงานที่บรรจุกลับ",
+    label: "ตำแหน่งเลขที่เดิม",
     sortable: true,
-    field: "organizationPositionReturn",
-    format(val, row) {
-      return row.organizationPositionOld.replace(/\n/g, " ");
-    },
+    field: "positionNumberOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format(val, row) {
+      return row.positionNumberOld;
+    },
   },
+
   {
     name: "positionLevel",
     align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภทเดิม",
     sortable: true,
     field: "positionLevel",
     headerStyle: "font-size: 14px",
@@ -120,6 +122,19 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+
+  {
+    name: "organizationPositionReturn",
+    align: "left",
+    label: "ตำแหน่ง/หน่วยงานที่บรรจุกลับ",
+    sortable: true,
+    field: "organizationPositionReturn",
+    format(val, row) {
+      return row.organizationPositionOld.replace(/\n/g, " ");
+    },
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "createdAt",
     align: "left",
@@ -455,9 +470,31 @@ onMounted(() => {
                     {{ props.rowIndex + 1 }}
                   </div>
 
+                  <div
+                    v-else-if="col.name === 'organizationPositionOld'"
+                    class="text-html"
+                  >
+                    {{ props.row.organizationPositionOld ?? "-" }}
+                  </div>
+
                   <div v-else-if="col.name === 'organizationPositionReturn'">
                     <div class="col-4">
-                      <div class="text-weight-medium">
+                      <div>
+                        {{
+                          props.row.position !== null ? props.row.position : ""
+                        }}{{
+                          (props.row.posTypeName !== null &&
+                            props.row.posTypeName === "บริหาร") ||
+                          props.row.posTypeName === "อำนวยการ"
+                            ? `${props.row.posTypeName}`
+                            : ""
+                        }}{{
+                          props.row.posLevelName !== null
+                            ? `${props.row.posLevelName}`
+                            : ""
+                        }}
+                      </div>
+                      <div>
                         {{ props.row.root !== null ? props.row.root : "-" }}
                         {{
                           props.row.rootShortName !== null
@@ -465,7 +502,7 @@ onMounted(() => {
                             : ""
                         }}
                       </div>
-                      <div class="text-weight-light">
+                      <div>
                         {{
                           props.row.nodeName !== null ? props.row.nodeName : ""
                         }}
@@ -478,13 +515,6 @@ onMounted(() => {
                     </div>
                   </div>
 
-                  <div
-                    v-else-if="col.name === 'organizationPositionOld'"
-                    class="text-html"
-                  >
-                    {{ props.row.organizationPositionOld ?? "-" }}
-                  </div>
-
                   <div v-else>
                     {{ col.value ? col.value : "-" }}
                   </div>