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

Merge branch 'nice_dev' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-09-15 16:49:31 +07:00
commit 0a6f0e20e0
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/07_insignia/components/2_Manage/listManage.vue
View file

@ -57,7 +57,11 @@ const fecthlistRound = async () => {
if (optionRound.value.length !== 0) { if (optionRound.value.length !== 0) {
DataStore.optionRound = optionRound.value; DataStore.optionRound = optionRound.value;
const lastValue = optionRound.value[0]; const lastValue = optionRound.value[0];
round.value = lastValue.id.toString(); if (DataStore.roundId) {
round.value = DataStore.roundId;
} else {
round.value = lastValue.id.toString();
}
DataStore.roundId = round.value; DataStore.roundId = round.value;
roundName.value = lastValue.name; roundName.value = lastValue.name;
await fecthStat(round.value); await fecthStat(round.value);

16
src/modules/07_insignia/store.ts
View file

@ -85,14 +85,16 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
} }
} else typeinsigniaOptions.value = [{ id: "all", name: "ทั้งหมด" }]; } else typeinsigniaOptions.value = [{ id: "all", name: "ทั้งหมด" }];
}; };
const searchDataTable = async (type: string, employeeClass: string) => { const searchDataTable = async (type: string, employeeClasstype: string) => {
if (type !== 'all' && employeeClass !== 'all') { typeinsignia.value = type
rows.value = listinsignia.value.filter((e: any) => e.insigniaSend === type && e.employeeType === profileType(employeeClass)) employeeClass.value = employeeClasstype
} else if (type !== 'all' && employeeClass === 'all') { if (type !== 'all' && employeeClasstype !== 'all') {
rows.value = listinsignia.value.filter((e: any) => e.insigniaSend === type && e.employeeType === profileType(employeeClasstype))
} else if (type !== 'all' && employeeClasstype === 'all') {
rows.value = listinsignia.value.filter((e: any) => e.insigniaSend === type) rows.value = listinsignia.value.filter((e: any) => e.insigniaSend === type)
} else if (type === 'all' && employeeClass !== 'all') { } else if (type === 'all' && employeeClasstype !== 'all') {
rows.value = listinsignia.value.filter((e: any) => e.employeeType === profileType(employeeClass)) rows.value = listinsignia.value.filter((e: any) => e.employeeType === profileType(employeeClasstype))
} else if (type === 'all' && employeeClass === 'all') { } else if (type === 'all' && employeeClasstype === 'all') {
rows.value = listinsignia.value rows.value = listinsignia.value
} }