diff --git a/src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue b/src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue index 8a284c7c8..0854bc10e 100644 --- a/src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue +++ b/src/modules/06_retirement/components/02_resign/DialogSendToCommand.vue @@ -146,8 +146,11 @@ const columns = ref([ sortable: true, field: "status", format(val, row) { - return statusText(row.status); + return props.mainTabs === "1" + ? statusText(row.status) + : statusText(row.status, "อนุญาต"); }, + headerStyle: "font-size: 14px", style: "font-size: 14px", }, diff --git a/src/modules/06_retirement/components/02_resign/Table.vue b/src/modules/06_retirement/components/02_resign/Table.vue index 7cde36b7d..a02cff9d6 100644 --- a/src/modules/06_retirement/components/02_resign/Table.vue +++ b/src/modules/06_retirement/components/02_resign/Table.vue @@ -135,7 +135,9 @@ const columns = ref([ sortable: true, field: "status", format(val, row) { - return statusText(row.status); + return stroeResign.mainTabs === "1" + ? statusText(row.status) + : statusText(row.status, "อนุญาต"); }, headerStyle: "font-size: 14px", style: "font-size: 14px", diff --git a/src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue b/src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue index 2e0439cb5..b90c88e31 100644 --- a/src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue +++ b/src/modules/06_retirement/components/03_resignEmp/DialogSendToCommand.vue @@ -119,7 +119,7 @@ const columns = ref([ field: "organizationPositionOld", headerStyle: "font-size: 14px", style: "font-size: 14px", - + // กรณี copy ทั้งหมด เเล้ว ค้นหา // format(val, row) { // return `${row.organizationPositionOld.replace(/\n/g, " ")}`; @@ -145,7 +145,9 @@ const columns = ref([ sortable: true, field: "status", format(val, row) { - return statusText(row.status); + return props.mainTabs === "1" + ? statusText(row.status) + : statusText(row.status, "อนุญาต"); }, headerStyle: "font-size: 14px", style: "font-size: 14px", diff --git a/src/modules/06_retirement/components/03_resignEmp/Table.vue b/src/modules/06_retirement/components/03_resignEmp/Table.vue index a8fd85b64..55d7c9c77 100644 --- a/src/modules/06_retirement/components/03_resignEmp/Table.vue +++ b/src/modules/06_retirement/components/03_resignEmp/Table.vue @@ -129,7 +129,9 @@ const columns = ref([ sortable: true, field: "status", format(val, row) { - return statusText(row.status); + return stroeResign.mainTabs === "1" + ? statusText(row.status) + : statusText(row.status, "อนุญาต"); }, headerStyle: "font-size: 14px", style: "font-size: 14px", diff --git a/src/modules/06_retirement/store/Main.ts b/src/modules/06_retirement/store/Main.ts index 8898bbdf2..58863bc45 100644 --- a/src/modules/06_retirement/store/Main.ts +++ b/src/modules/06_retirement/store/Main.ts @@ -1,16 +1,16 @@ import { defineStore } from "pinia"; export const useRetirementDataStore = defineStore("retirement", () => { - const statusText = (val: string) => { + const statusText = (val: string, rejectText: string = "อนุมัติ") => { switch (val) { case "WAITTING": return "ใหม่"; case "PENDING": return "รอดำเนินการ"; case "APPROVE": - return "อนุมัติ"; + return rejectText; case "REJECT": - return "ไม่อนุมัติ"; + return `ไม่${rejectText}`; case "REPORT": return "ส่งรายชื่อไปออกคำสั่ง"; case "WAITING":