diff --git a/src/modules/07_insignia/interface/response/Main.ts b/src/modules/07_insignia/interface/response/Main.ts index 4c1f597ca..85a57df07 100644 --- a/src/modules/07_insignia/interface/response/Main.ts +++ b/src/modules/07_insignia/interface/response/Main.ts @@ -131,7 +131,7 @@ interface ResponseManageList { profileType: string; rank: string; reason: string; - requestDate: Date | string; + requestDate: Date; requestInsignia: string; requestInsigniaShortName: string; requestNote: string; diff --git a/src/modules/07_insignia/store.ts b/src/modules/07_insignia/store.ts index ecc1eb8aa..e44b35d7c 100644 --- a/src/modules/07_insignia/store.ts +++ b/src/modules/07_insignia/store.ts @@ -90,11 +90,7 @@ export const useInsigniaDataStore = defineStore("insignia", () => { })` : "", insigniaLevel: e.level ? e.level : "", - dateSend: e.requestDate - ? typeof e.requestDate === "string" - ? e.requestDate - : e.requestDate.toISOString() - : null, + dateSend: e.requestDate ? date2Thai(e.requestDate) : null, requestNote: e.requestNote ? e.requestNote : "", employeeType: profileType(e.profileType) || null, reason: e.reason ? e.reason : "",