Merge branch 'develop' into dev-tee
This commit is contained in:
commit
94f85adc0c
21 changed files with 3020 additions and 737 deletions
|
|
@ -55,8 +55,12 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
|
|||
dateSend: date2Thai(e.requestDate),
|
||||
requestNote: e.requestNote,
|
||||
employeeType: profileType(e.profileType),
|
||||
reason: e.reason
|
||||
|
||||
reason: e.reason,
|
||||
markDiscipline: e.markDiscipline,
|
||||
markLeave: e.markLeave,
|
||||
markRate: e.markRate,
|
||||
isApprove: e.isApprove,
|
||||
statusMark: e.markDiscipline === true || e.markLeave === true || e.markRate === true ? true : false
|
||||
}));
|
||||
rows.value = await datalist;
|
||||
listinsignia.value = await datalist;
|
||||
|
|
@ -146,6 +150,7 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
return {
|
||||
roundId,
|
||||
optionRound,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue