From 6cf673626e8e38392f79e83a7f230e39b25d6854 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 1 Mar 2024 15:00:41 +0700
Subject: [PATCH 1/2] no message

---
 src/modules/13_salary/views/salaryLists.vue | 48 +++++++++++----------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue
index 005c98762..a4c521142 100644
--- a/src/modules/13_salary/views/salaryLists.vue
+++ b/src/modules/13_salary/views/salaryLists.vue
@@ -38,34 +38,13 @@ const periodLatest = ref<DataPeriodLatest>();
 
 const isLoad = ref<boolean>(false);
 
+/** ตัวแปร select*/
 const page = ref<number>(1);
 const pageSize = ref<number>(50);
 const lastPage = ref<number>(0);
 const loading = ref(false);
 const nextPage = ref<number>(1);
 
-function onScroll({ to, ref }: { to: number; ref: any }) {
-  const lastIndex = roundOptions.value.length - 1;
-
-  if (
-    loading.value !== true &&
-    nextPage.value < lastPage.value &&
-    to === lastIndex
-  ) {
-    loading.value = true;
-
-    setTimeout(() => {
-      nextPage.value++;
-      page.value = nextPage.value;
-      getRound();
-      nextTick(() => {
-        ref.refresh();
-        loading.value = false;
-      });
-    }, 500);
-  }
-}
-
 /**function เรียกข้อมูลรอบการขึ้นเงินเดือน*/
 async function getRound() {
   showLoader();
@@ -278,6 +257,29 @@ async function onChangeAgency() {
   }
 }
 
+/** function onScrollSelect รอบการขึ้นเงินเดือน*/
+function onScroll({ to, ref }: { to: number; ref: any }) {
+  const lastIndex = roundOptions.value.length - 1;
+
+  if (
+    loading.value !== true &&
+    nextPage.value < lastPage.value &&
+    to === lastIndex
+  ) {
+    loading.value = true;
+
+    setTimeout(() => {
+      nextPage.value++;
+      page.value = nextPage.value;
+      getRound();
+      nextTick(() => {
+        ref.refresh();
+        loading.value = false;
+      });
+    }, 500);
+  }
+}
+
 onMounted(async () => {
   await getRound();
 });
@@ -289,7 +291,7 @@ onMounted(async () => {
       รายการเงินเดือน
     </div>
     <q-space />
-    <!-- @virtual-scroll="onScroll" -->
+
     <q-select
       v-model="roundFilter"
       label="รอบการขึ้นเงินเดือน"

From ec11818b3ff65bf5b8e10d2b3695bd6a0a21f5d8 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 1 Mar 2024 15:08:51 +0700
Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=AD=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=A3=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=87=20=3D>=20=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20filte?=
 =?UTF-8?q?r=20tree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/02_organizationalNew/components/DialogMovePos.vue | 2 +-
 .../02_organizationalNew/components/DialogSuccession.vue      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogMovePos.vue b/src/modules/02_organizationalNew/components/DialogMovePos.vue
index 88bf12082..ae406442c 100644
--- a/src/modules/02_organizationalNew/components/DialogMovePos.vue
+++ b/src/modules/02_organizationalNew/components/DialogMovePos.vue
@@ -255,7 +255,7 @@ watch(
               selected-color="primary"
               :nodes="nodeTree"
               node-key="orgTreeId"
-              label-key="orgTreeName"
+              label-key="labelName"
               :filter="filterTree"
               no-results-label="ไม่พบข้อมูลที่ค้นหา"
               no-nodes-label="ไม่มีข้อมูล"
diff --git a/src/modules/02_organizationalNew/components/DialogSuccession.vue b/src/modules/02_organizationalNew/components/DialogSuccession.vue
index 68616410c..51f37a424 100644
--- a/src/modules/02_organizationalNew/components/DialogSuccession.vue
+++ b/src/modules/02_organizationalNew/components/DialogSuccession.vue
@@ -112,7 +112,7 @@ const reqMaster = reactive<FilterMaster>({
   page: 1,
   pageSize: 10,
   keyword: "",
-  revisionId: store.activeId
+  revisionId: store.activeId,
 });
 const totalRow = ref<number>(0);
 const selectedPos = ref<PosMaster[]>([]);
@@ -264,7 +264,7 @@ function clearForm() {
               selected-color="primary"
               :nodes="nodeTree"
               node-key="orgTreeId"
-              label-key="orgTreeName"
+              label-key="labelName"
               :filter="filterTree"
               no-results-label="ไม่พบข้อมูลที่ค้นหา"
               no-nodes-label="ไม่มีข้อมูล"