diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts index e901aaa7e..e7e3ee1ad 100644 --- a/src/api/06_retirement/api.retirement.ts +++ b/src/api/06_retirement/api.retirement.ts @@ -77,9 +77,15 @@ export default { //รายงาน retirementReport: `${report}`, - addResign: (profileType:string,type: string, id: string) => + addResign: (profileType: string, type: string, id: string) => `${retirement}/resign${profileType}/officer/add-resign/${type}/${id}`, - sendApproveRetirement:(type:string,id:string)=>`${retirement}/resign${type}/admin/approve/officer/${id}`, - commanderApproveRetirement:(type:string,id:string,typeApprove:string,path:string)=>`${retirement}/resign${type}/admin/${typeApprove}${path}/${id}` + sendApproveRetirement: (type: string, id: string) => + `${retirement}/resign${type}/admin/approve/officer/${id}`, + commanderApproveRetirement: ( + type: string, + id: string, + typeApprove: string, + path: string = "" + ) => `${retirement}/resign${type}/admin/${typeApprove}${path}/${id}`, }; diff --git a/src/modules/06_retirement/store/Main.ts b/src/modules/06_retirement/store/Main.ts index 5115fef89..b63e19d50 100644 --- a/src/modules/06_retirement/store/Main.ts +++ b/src/modules/06_retirement/store/Main.ts @@ -23,6 +23,8 @@ export const useRetirementDataStore = defineStore("retirement", () => { return "ยกเลิกการลาออก"; case "DONEREJECT": return "ออกคำสั่งยกเลิกลาออกเสร็จแล้ว"; + case "CANCELING": + return "กำลังดำเนินการยกเลิก"; default: return "-"; } @@ -41,6 +43,6 @@ export const useRetirementDataStore = defineStore("retirement", () => { return { statusText, - convertStatusText + convertStatusText, }; });