updated

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

@@ -20,7 +20,7 @@ const {
   messageError,
   dialogConfirm,
   hideLoader,
-  findOrgName,
+  date2Thai,
 } = mixin;
 
 /** คอลัมน์ */
@@ -46,15 +46,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",
@@ -65,27 +56,34 @@ const columns2 = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
     format(val, row) {
       let name = "";
-      if (row.posTypeName && row.posLevelName) {
+      if (row.positionTypeOld && row.positionLevelOld) {
-        name = `${row.posTypeName} (${row.posLevelName})`;
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
-      } else if (row.posTypeName) {
+      } else if (row.positionTypeOld) {
-        name = `${row.posTypeName}`;
+        name = `${row.positionTypeOld}`;
-      } else if (row.posLevelName) {
+      } else if (row.positionLevelOld) {
-        name = `(${row.posLevelName})`;
+        name = `(${row.positionLevelOld})`;
       } else name = "-";
       return name;
     },
   },
   {
-    name: "org",
+    name: "organizationPositionOld",
     align: "left",
-    label: "สังกัด",
+    label: "ตำแหน่ง/สังกัดเดิม",
     sortable: true,
-    field: "org",
+    field: "organizationPositionOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format(val, row) {
+  },
-      return findOrgName(row);
+  {
-    },
+    name: "createdAt",
+    align: "left",
+    label: "วันที่ดำเนินการ",
+    sortable: true,
+    field: "createdAt",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val) => date2Thai(val),
   },
   {
     name: "status",
@@ -103,9 +101,9 @@ const columns2 = ref<QTableProps["columns"]>([
 const visibleColumns2 = ref<string[]>([
   "no",
   "fullname",
-  "position",
   "positionLevel",
-  "org",
+  "organizationPositionOld",
+  "createdAt",
   "status",
 ]);
 

src/modules/06_retirement/components/DismissOrder/DismissOrder.vue

@@ -22,7 +22,7 @@ const {
   hideLoader,
   success,
   dialogMessage,
-  findOrgName,
+  findOrgNameOld,
 } = mixin;
 const { statusText } = transferStore;
 const modal = ref<boolean>(false);
@@ -31,9 +31,8 @@ const modal = ref<boolean>(false);
 const visibleColumns = ref<string[]>([
   "no",
   "fullname",
-  "position",
   "positionLevel",
-  "org",
+  "organizationPositionOld",
   "createdAt",
   "status",
 ]);
@@ -69,15 +68,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",
@@ -88,27 +78,24 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
     format(val, row) {
       let name = "";
-      if (row.posTypeName && row.posLevelName) {
+      if (row.positionTypeOld && row.positionLevelOld) {
-        name = `${row.posTypeName} (${row.posLevelName})`;
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
-      } else if (row.posTypeName) {
+      } else if (row.positionTypeOld) {
-        name = `${row.posTypeName}`;
+        name = `${row.positionTypeOld}`;
-      } else if (row.posLevelName) {
+      } else if (row.positionLevelOld) {
-        name = `(${row.posLevelName})`;
+        name = `(${row.positionLevelOld})`;
       } else name = "-";
       return name;
     },
   },
   {
-    name: "org",
+    name: "organizationPositionOld",
     align: "left",
-    label: "สังกัด",
+    label: "ตำแหน่ง/สังกัดเดิม",
     sortable: true,
-    field: "org",
+    field: "organizationPositionOld",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
-    format(val, row) {
-      return findOrgName(row);
-    },
   },
   {
     name: "createdAt",