updated retirement field

src/modules/06_retirement/components/resign/DialogSendToCommand.vue

@@ -40,28 +40,36 @@ const columns2 = ref<QTableProps["columns"]>([
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
-
   {
-    name: "positionTypeOld",
+    name: "location",
     align: "left",
-    label: "ตำแหน่งในสายงาน",
+    label: "สถานที่ยื่นขอลาออกจากราชการ",
     sortable: true,
-    field: "positionTypeOld",
+    field: "location",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
-    name: "positionLevelOld",
+    name: "positionLevel",
     align: "left",
-    label: "ระดับ",
+    label: "ประเภทตำแหน่ง",
     sortable: true,
-    field: "positionLevelOld",
+    field: "positionLevel",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+    format(val, row) {
+      let name = "";
+      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: "positionNumberOld",
@@ -77,7 +85,7 @@ const columns2 = ref<QTableProps["columns"]>([
   {
     name: "organizationPositionOld",
     align: "left",
-    label: "สังกัด",
+    label: "ตำแหน่ง/สังกัดเดิม",
     sortable: true,
     field: "organizationPositionOld",
     headerStyle: "font-size: 14px",
@@ -113,9 +121,10 @@ const columns2 = ref<QTableProps["columns"]>([
 /** คอลัมน์ที่แสดง */
 const visibleColumns2 = ref<string[]>([
   "no",
+  "prefix",
   "fullname",
-  "positionTypeOld",
-  "positionLevelOld",
+  "location",
+  "positionLevel",
   "positionNumberOld",
   "organizationPositionOld",
   "datetext",
@@ -268,35 +277,22 @@ watchEffect(() => {
                   v-model="props.selected"
                 />
               </q-td>
-              <q-td key="no" :props="props">
-                {{ props.rowIndex + 1 }}
-              </q-td>
-              <q-td key="prefix" :props="props">
-                {{ props.row.prefix }}
-              </q-td>
-              <q-td key="fullname" :props="props">
-                {{ props.row.fullname }}
-              </q-td>
-              <q-td key="positionTypeOld" :props="props">
-                {{ props.row.positionTypeOld }}
-              </q-td>
-              <q-td key="positionLevelOld" :props="props">
-                {{ props.row.positionLevelOld }}
-              </q-td>
-              <q-td key="positionNumberOld" :props="props">
-                {{ props.row.positionNumberOld }}
-              </q-td>
-
-              <q-td key="organizationPositionOld" :props="props">
-                <div class="table_ellipsis">
-                  {{ props.row.organizationPositionOld }}
+              <q-td v-for="col in props.cols" :key="col.id">
+                <div v-if="col.name === 'no'">
+                  {{ props.rowIndex + 1 }}
+                </div>
+
+                <div
+                  v-else
+                  :class="
+                    col.name === 'organizationPositionOld' ||
+                    col.name === 'organization'
+                      ? 'table_ellipsis'
+                      : ''
+                  "
+                >
+                  {{ col.value ? col.value : "-" }}
                 </div>
-              </q-td>
-              <q-td key="datetext" :props="props">
-                {{ props.row.datetext }}
-              </q-td>
-              <q-td key="statustext" :props="props">
-                {{ props.row.statustext }}
               </q-td>
             </q-tr>
           </template>