From a4b7549cd3d11ab319d3c400534e8be8642831fa Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Mon, 9 Oct 2023 09:42:55 +0700 Subject: [PATCH] v-slot:no-option --- .../07_insignia/components/2_Manage/Tab1.vue | 14 ++ .../07_insignia/components/2_Manage/Tab2.vue | 14 ++ .../07_insignia/components/2_Manage/Tab3.vue | 14 ++ .../components/4_Allocate/Main.vue | 15 ++ .../07_insignia/components/5_Borrow/Main.vue | 215 ++++++++++-------- .../components/report/Report_02.vue | 10 +- src/modules/07_insignia/views/ResultPage.vue | 21 ++ 7 files changed, 204 insertions(+), 99 deletions(-) diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue index 9f67d4aec..86f5b97f9 100644 --- a/src/modules/07_insignia/components/2_Manage/Tab1.vue +++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue @@ -721,6 +721,13 @@ const clearInsigniaFilters = (name: string) => { ) " class="cursor-pointer" /> +
{ ) " class="cursor-pointer" /> +
diff --git a/src/modules/07_insignia/components/2_Manage/Tab2.vue b/src/modules/07_insignia/components/2_Manage/Tab2.vue index b7601b306..c30cbf972 100644 --- a/src/modules/07_insignia/components/2_Manage/Tab2.vue +++ b/src/modules/07_insignia/components/2_Manage/Tab2.vue @@ -314,6 +314,13 @@ const clearInsigniaFilters = (name: string) => { class="cursor-pointer" /> +
{ class="cursor-pointer" /> +
diff --git a/src/modules/07_insignia/components/2_Manage/Tab3.vue b/src/modules/07_insignia/components/2_Manage/Tab3.vue index 90c698360..e16e9e537 100644 --- a/src/modules/07_insignia/components/2_Manage/Tab3.vue +++ b/src/modules/07_insignia/components/2_Manage/Tab3.vue @@ -311,6 +311,13 @@ const clearInsigniaFilters = (name: string) => { class="cursor-pointer" /> +
{ class="cursor-pointer" /> +
diff --git a/src/modules/07_insignia/components/4_Allocate/Main.vue b/src/modules/07_insignia/components/4_Allocate/Main.vue index 5f59ec1da..edaad2878 100644 --- a/src/modules/07_insignia/components/4_Allocate/Main.vue +++ b/src/modules/07_insignia/components/4_Allocate/Main.vue @@ -316,6 +316,7 @@ const filterSelector = (val: any, update: Function, name: any) => { ) } const clearInsigniaFilters = (name: string) => { + console.log(insigniaOp.value) if (name === "filterInsigniaOp") { DataStore.insignia = ''; filterInsigniaOp.value = insigniaOp.value; @@ -352,6 +353,13 @@ const clearInsigniaFilters = (name: string) => { input-class="text-bold text-grey" @update:model-value="selectorRound(selectRound)" > +
@@ -412,6 +420,13 @@ const clearInsigniaFilters = (name: string) => { class="cursor-pointer" /> + diff --git a/src/modules/07_insignia/components/5_Borrow/Main.vue b/src/modules/07_insignia/components/5_Borrow/Main.vue index bea7ee40f..383894ec0 100644 --- a/src/modules/07_insignia/components/5_Borrow/Main.vue +++ b/src/modules/07_insignia/components/5_Borrow/Main.vue @@ -30,7 +30,7 @@ const roundYear = ref(); const insigniaList = ref([]); const fileterInsigniaList = ref([]); const loadView = ref(false); -const employeeClassOps = ref(DataStore.employeeClassOps) +const employeeClassOps = ref(DataStore.employeeClassOps); onMounted(async () => { await fecthRound(); }); @@ -61,10 +61,10 @@ const fecthRound = async () => { year: e.year, }); }); - filterSelectRoundAllOption.value = selectRoundAllOption.value + filterSelectRoundAllOption.value = selectRoundAllOption.value; selectRound.value = data[0].id; - filterSelectRoundOption.value = selectRoundOption.value - console.log(filterSelectRoundOption.value) + filterSelectRoundOption.value = selectRoundOption.value; + console.log(filterSelectRoundOption.value); yearRound.value = data[0].year; roundYear.value = data[0].year; if (roundYear.value) { @@ -331,7 +331,7 @@ watch(tab, async () => { (x: any) => x.type == tab.value || x.type == "" ); DataStore.insignia = ""; - fileterInsigniaList.value = insigniaList.value + fileterInsigniaList.value = insigniaList.value; fecthlistInsignia(); }); @@ -401,34 +401,30 @@ const paginationLabel = (start: number, end: number, total: number) => { const filterSelector = (val: any, update: Function, name: any) => { update(() => { const needle = val.toLowerCase(); - if (name === 'employeeClassOps') { - DataStore.employeeClass = '' - employeeClassOps.value = DataStore.employeeClassOps.filter( - (v: any) => v.name.toLowerCase().indexOf(needle) > -1 - ); - } - else if (name === 'fileterInsigniaList') { - DataStore.insignia = null as any + if (name === "employeeClassOps") { + DataStore.employeeClass = ""; + employeeClassOps.value = DataStore.employeeClassOps.filter( + (v: any) => v.name.toLowerCase().indexOf(needle) > -1 + ); + } else if (name === "fileterInsigniaList") { + DataStore.insignia = null as any; fileterInsigniaList.value = insigniaList.value.filter( - (v: any) => v.name.toLowerCase().indexOf(needle) > -1 - ); - } - else if (name === 'filterSelectRoundAllOption') { - yearRound.value = null as any + (v: any) => v.name.toLowerCase().indexOf(needle) > -1 + ); + } else if (name === "filterSelectRoundAllOption") { + yearRound.value = null as any; filterSelectRoundAllOption.value = selectRoundAllOption.value.filter( - (v: any) => v.name.toLowerCase().indexOf(needle) > -1 - ); + (v: any) => v.name.toLowerCase().indexOf(needle) > -1 + ); } - } - ) -} + }); +}; const clearInsigniaFilters = (name: string) => { if (name === "employeeClassOps") { DataStore.employeeClass = "all"; employeeClassOps.value = DataStore.employeeClassOps; - } - else if (name === "fileterInsigniaList") { + } else if (name === "fileterInsigniaList") { DataStore.insignia = ""; fileterInsigniaList.value = insigniaList.value; } @@ -470,27 +466,34 @@ const clearInsigniaFilters = (name: string) => { >
- - + > + +
{ DataStore.employeeClass ) " - @filter="(inputValue:any, + @filter="(inputValue:any, doneFn:Function) => filterSelector(inputValue, doneFn,'fileterInsigniaList' ) " - > - + + +
+
+ - - -
-
- - - - + > + + +
diff --git a/src/modules/07_insignia/components/report/Report_02.vue b/src/modules/07_insignia/components/report/Report_02.vue index 23c2a6177..b7741a6e4 100644 --- a/src/modules/07_insignia/components/report/Report_02.vue +++ b/src/modules/07_insignia/components/report/Report_02.vue @@ -185,7 +185,15 @@ const filterSelector = (val: any, update: Function, name: any) => { @update:model-value="updateSelect" @filter="(inputValue:any,doneFn:Function) => filterSelector(inputValue, doneFn,'selectList') " - /> + > + +
diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue index 06e6c6173..46900cc12 100644 --- a/src/modules/07_insignia/views/ResultPage.vue +++ b/src/modules/07_insignia/views/ResultPage.vue @@ -637,6 +637,13 @@ const clearInsigniaFilters = (name: string) => { class="cursor-pointer" /> + { class="cursor-pointer" /> +
{ class="cursor-pointer" /> +