From 070e73916dfe9aa2a7c4656055f142d04dc4555e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 18 Mar 2024 17:35:05 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99?=
 =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=99=E0=B8=82=E0=B9=89=E0=B8=B2=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=AF=20=3D>=20?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=AD=E0=B8=9A=E0=B8=9E=E0=B8=B4=E0=B9=80=E0=B8=A8?=
 =?UTF-8?q?=E0=B8=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/13_salary/components/SalaryLists/TabMain.vue        | 2 +-
 src/modules/13_salary/components/SalaryLists/TableTypeOther.vue | 2 +-
 .../13_salary/components/SalaryLists/TableTypePending.vue       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue
index b45d39e88..9f4a54cb9 100644
--- a/src/modules/13_salary/components/SalaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue
@@ -451,7 +451,7 @@ onMounted(() => {
               ? itemsCard.slice(0, 5)
               : store.roundMainCode === 'OCT'
               ? itemsCard.slice(5, 12)
-              : itemsCard"
+              : []"
             :key="index"
             :class="
               store.roundMainCode === 'APR'
diff --git a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
index a65ec42dd..df1098e0a 100644
--- a/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
+++ b/src/modules/13_salary/components/SalaryLists/TableTypeOther.vue
@@ -422,7 +422,7 @@ watch(
             <q-menu>
               <q-list dense style="min-width: 150px">
                 <q-item
-                  v-for="(item, index) in store.itemMenu.filter((x:any)=>x.type != 'properties')"
+                  v-for="(item, index) in store.roundCode !== 'SPECIAL' ? store.itemMenu.filter((x:any)=>x.type !== 'properties') :store.itemMenu.filter((x:any)=>x.type !== 'moveGroup' && x.type !== 'properties')"
                   :key="index"
                   clickable
                   v-close-popup
diff --git a/src/modules/13_salary/components/SalaryLists/TableTypePending.vue b/src/modules/13_salary/components/SalaryLists/TableTypePending.vue
index 2ede97af8..72746d33a 100644
--- a/src/modules/13_salary/components/SalaryLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/SalaryLists/TableTypePending.vue
@@ -501,7 +501,7 @@ watch(
             <q-menu>
               <q-list dense style="min-width: 150px">
                 <q-item
-                  v-for="(item, index) in store.itemMenu"
+                  v-for="(item, index) in store.roundCode !== 'SPECIAL'? store.itemMenu :store.itemMenu.filter((x:any)=>x.type !== 'moveGroup')"
                   :key="index"
                   clickable
                   v-close-popup