diff --git a/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue b/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue index 44cc2c50f..b29376e1c 100644 --- a/src/modules/06_retirement/components/DismissOrder/DialogSendToCommand.vue +++ b/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([ 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([ 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: "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([ const visibleColumns2 = ref([ "no", "fullname", - "position", "positionLevel", - "org", + "organizationPositionOld", + "createdAt", "status", ]); diff --git a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue index 49e0e64a6..698dce91b 100644 --- a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue +++ b/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(false); @@ -31,9 +31,8 @@ const modal = ref(false); const visibleColumns = ref([ "no", "fullname", - "position", "positionLevel", - "org", + "organizationPositionOld", "createdAt", "status", ]); @@ -69,15 +68,6 @@ const columns = ref([ 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([ 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: "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",