hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

Browse source 
# Conflicts:
#	src/modules/11_discipline/store/InvestigateDisStore.ts
This commit is contained in:
setthawutttty 2023-11-28 11:22:24 +07:00
commit 9e8516fc0b
10 changed files with 297 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/11_discipline/store/InvestigateDisStore.ts
View file

@ -47,10 +47,10 @@ export const useInvestigateDisStore = defineStore(
title: e.title,
respondentType: convertRespondentType(e.respondentType),
offenseDetails: convertFault(e.offenseDetails),
disciplinaryFaultLevel: e.disciplinaryFaultLevel,
disciplinaryCaseFault: e.disciplinaryCaseFault,
status: e.status,
createdAt: date2Thai(e.createdAt),
disciplinaryFaultLevel: e.disciplinaryFaultLevel ?? "-",
disciplinaryCaseFault: e.disciplinaryCaseFault ?? "-",
status: e.status ?? "-",
createdAt: e.createdAt ? date2Thai(e.createdAt) : "-",
}));
rows.value = datalist;
@ -90,6 +90,8 @@ export const useInvestigateDisStore = defineStore(
return "ความผิดวินัยไม่ร้ายแรง";
case "DEADLY":
return "ความผิดวินัยร้ายแรง";
default:
return "-";
}
}
function convertSatatus(val: string) {
@ -306,6 +308,7 @@ export const useInvestigateDisStore = defineStore(
optionsTypefault,
optionsfaultLevel,
fecthDirector,
visibleColumns,
columns,
visibleColumnsDirector,