Merge branch 'nice_dev' into develop

src/modules/07_insignia/components/4_Allocate/Main.vue

@@ -179,6 +179,7 @@ const selectorRound = (round: string) => {
   selectRound.value = round;
   const yearFilter = selectRoundOption.value.find((x: any) => x.id == round);
   roundYear.value = yearFilter?.year;
+  fecthlistInsignia();
 };
 
 const fecthlistInsignia = async () => {
@@ -303,7 +304,7 @@ const resetFilter = () => {
   >
     <div class="bg-grey-1 col-12 row items-center">
       <div class="q-pl-md q-pr-sm text-weight-medium text-grey-7">รอบ</div>
-      <selector
+      <q-select
         hide-bottom-space
         borderless
         dense
@@ -318,9 +319,9 @@ const resetFilter = () => {
         use-input
         input-debounce="0"
         input-class="text-bold text-grey"
-        @update:emit-value="selectorRound"
+        @update:model-value="selectorRound(selectRound)"
       >
-      </selector>
+      </q-select>
     </div>
     <q-separator />
     <q-tabs

src/modules/07_insignia/store.ts

@@ -90,6 +90,8 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
       rows.value = listinsignia.value.filter((e: any) => e.insigniaType === type)
     } else if (type === 'all' && employeeClass !== 'all') {
       rows.value = listinsignia.value.filter((e: any) => e.employeeType === profileType(employeeClass))
+    } else if (type === 'all' && employeeClass === 'all') {
+      rows.value = listinsignia.value
     }
 
 

src/modules/07_insignia/storeResult.ts

@@ -72,6 +72,8 @@ export const useResultDataStore = defineStore("insigniaResult", () => {
     } else if (invoice === 'all' && employeeClass !== 'all') {
       let list = listInsignia.value.filter((e: any) => e.employeeType === profileType(employeeClass))
       rows.value = list
+    } else if (invoice === 'all' && employeeClass == 'all') {
+      rows.value = listInsignia.value
     }
   }
   const status = (val: string) => {

src/modules/07_insignia/views/ResultPage.vue

@@ -274,6 +274,7 @@ const selectorInsignia = () => {
 };
 const selectorRound = (round: string) => {
   selectRound.value = round;
+  fecthlistInsignia();
 };
 const fecthlistInsignia = async () => {
   showLoader();
@@ -426,7 +427,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
     <div class="bg-grey-1 col-12 row items-center">
       <div class="q-pl-md q-pr-sm text-weight-medium text-grey-7">รอบ</div>
       <div>
-        <selector
+        <q-select
           hide-bottom-space
           borderless
           dense
@@ -441,9 +442,9 @@ const paginationLabel = (start: number, end: number, total: number) => {
           use-input
           input-debounce="0"
           input-class="text-bold text-grey"
-          @update:emit-value="selectorRound"
+          @update:model-value="selectorRound(selectRound)"
         >
-        </selector>
+        </q-select>
       </div>
     </div>
     <q-separator />