From fe30f6b607b081048069c3c1d08f305f3ac4adf8 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 14 Jul 2025 10:52:32 +0700
Subject: [PATCH 1/3] fix rows-per-page

---
 .../13_salary/components/02_salaryEmployee/TabStructure.vue     | 2 +-
 .../components/05_salaryListsEmployee/TableTypeOther.vue        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/13_salary/components/02_salaryEmployee/TabStructure.vue b/src/modules/13_salary/components/02_salaryEmployee/TabStructure.vue
index a3b10b375..e248ea98d 100644
--- a/src/modules/13_salary/components/02_salaryEmployee/TabStructure.vue
+++ b/src/modules/13_salary/components/02_salaryEmployee/TabStructure.vue
@@ -288,7 +288,7 @@ onMounted(() => {
     :rows="rows"
     :columns="columns"
     row-key="name"
-    :rows-per-page-options="[1, 10, 20, 50, 100]"
+    :rows-per-page-options="[10, 20, 50, 100]"
     :visible-columns="visibleColumns"
     @update:pagination="updatePageSize"
   >
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
index ea79252dc..9f12353e4 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
@@ -389,7 +389,7 @@ watch(
     bordered
     :paging="true"
     dense
-    :rows-per-page-options="[1,10, 25, 50, 100]"
+    :rows-per-page-options="[10, 25, 50, 100]"
     :visible-columns="visibleColumns"
     @update:pagination="updatePageSizePagination"
   >

From 6f7bdb91ee413d3a00ab54baea5f9faf660b0653 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 14 Jul 2025 10:59:09 +0700
Subject: [PATCH 2/3] fix row-per-page

---
 src/modules/06_retirement/components/02_resign/ResignByid.vue   | 2 +-
 src/modules/06_retirement/components/02_resign/ResignReject.vue | 2 +-
 .../06_retirement/components/03_resignEmp/ResignByid.vue        | 2 +-
 .../06_retirement/components/03_resignEmp/ResignReject.vue      | 2 +-
 src/modules/09_leave/components/05_Leave/DetailLeavePage.vue    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/modules/06_retirement/components/02_resign/ResignByid.vue b/src/modules/06_retirement/components/02_resign/ResignByid.vue
index d42dc131c..a33f25fcf 100644
--- a/src/modules/06_retirement/components/02_resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue
@@ -1152,7 +1152,7 @@ onMounted(async () => {
           bordered
           :paging="true"
           dense
-          :rows-per-page-options="[1, 25, 50, 100]"
+          :rows-per-page-options="[10, 25, 50, 100]"
         >
           <template v-slot:header="props">
             <q-tr :props="props">
diff --git a/src/modules/06_retirement/components/02_resign/ResignReject.vue b/src/modules/06_retirement/components/02_resign/ResignReject.vue
index 8fc0fb331..b0061bcc4 100644
--- a/src/modules/06_retirement/components/02_resign/ResignReject.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignReject.vue
@@ -547,7 +547,7 @@ onMounted(async () => {
           bordered
           :paging="true"
           dense
-          :rows-per-page-options="[1, 25, 50, 100]"
+          :rows-per-page-options="[10, 25, 50, 100]"
         >
           <template v-slot:header="props">
             <q-tr :props="props">
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
index c2ebfa160..ec11f42b2 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignByid.vue
@@ -1166,7 +1166,7 @@ onMounted(async () => {
           bordered
           :paging="true"
           dense
-          :rows-per-page-options="[1, 25, 50, 100]"
+          :rows-per-page-options="[10, 25, 50, 100]"
         >
           <template v-slot:header="props">
             <q-tr :props="props">
diff --git a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
index c6d277a82..76cbe2a2b 100644
--- a/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
+++ b/src/modules/06_retirement/components/03_resignEmp/ResignReject.vue
@@ -532,7 +532,7 @@ onMounted(async () => {
           bordered
           :paging="true"
           dense
-          :rows-per-page-options="[1, 25, 50, 100]"
+          :rows-per-page-options="[10, 25, 50, 100]"
         >
           <template v-slot:header="props">
             <q-tr :props="props">
diff --git a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
index d684798b6..df67dc137 100644
--- a/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
+++ b/src/modules/09_leave/components/05_Leave/DetailLeavePage.vue
@@ -951,7 +951,7 @@ onMounted(async () => {
                     bordered
                     :paging="true"
                     dense
-                    :rows-per-page-options="[1, 25, 50, 100]"
+                    :rows-per-page-options="[10, 25, 50, 100]"
                   >
                     <template v-slot:header="props">
                       <q-tr :props="props">

From ee139530b27e586d34ad69e316ca410cb143448d Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Mon, 14 Jul 2025 11:50:12 +0700
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=84=E0=B8=B0=E0=B9=81=E0=B8=99=E0=B8=99=20KPI=20=E0=B8=81?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=93=E0=B8=B5=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=9C?=
 =?UTF-8?q?=E0=B8=B9=E0=B9=89=E0=B8=82=E0=B8=AD=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99=E0=B8=A1=E0=B8=B5=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=96=E0=B8=B2=E0=B8=99=E0=B8=B0=E0=B8=97=E0=B8=94=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=AD=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=B9=E0=B9=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../14_KPI/components/Tab/01_Assessment.vue   | 24 +++++++++++++++----
 .../components/Tab/Topic/02_Competency.vue    |  5 +++-
 src/modules/14_KPI/store.ts                   |  7 ++++++
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/modules/14_KPI/components/Tab/01_Assessment.vue b/src/modules/14_KPI/components/Tab/01_Assessment.vue
index e781b33ed..dbd6af5d1 100644
--- a/src/modules/14_KPI/components/Tab/01_Assessment.vue
+++ b/src/modules/14_KPI/components/Tab/01_Assessment.vue
@@ -184,7 +184,11 @@ watch(
         Number(resultAssigned.value);
 
       store.indicatorScoreVal =
-        store.indicatorPercentVal * (store.indicatorScore / 100);
+        store.indicatorPercentVal *
+        ((store.dataEvaluation.isProbation
+          ? store.indicatorProbationScore
+          : store.indicatorScore) /
+          100);
 
       if (store.isUpdate && store.tabMain === "3") {
         http
@@ -435,7 +439,11 @@ onMounted(async () => {
             <div class="col-12 text-center row justify-center">
               <span
                 >สรุปผลการประเมินผลสัมฤทธิ์ของงาน (คะแนนเต็ม
-                {{ store.indicatorScore }}
+                {{
+                  store.dataEvaluation.isProbation
+                    ? store.indicatorProbationScore
+                    : store.indicatorScore
+                }}
                 คะแนน)</span
               >
               <div class="text-primary q-pl-md">
@@ -466,7 +474,9 @@ onMounted(async () => {
             name: `สรุปผลการประเมินสมรรถนะ (คะแนนเต็ม ${
               store.dataEvaluation.posTypeName != 'อำนวยการ' &&
               store.dataEvaluation.posTypeName != 'บริหาร'
-                ? store.competencyScore
+                ? store.dataEvaluation.isProbation
+                  ? store.competencyProbationScore
+                  : store.competencyScore
                 : store.excusiveCompetencyScore
             } คะแนน)`,
             value: store.competencyScoreVal.toFixed(2),
@@ -544,7 +554,13 @@ onMounted(async () => {
           <div class="col-12 text-center row justify-center">
             <span
               >สรุปผลการประเมินพฤติกรรมการปฏิบัติราชการ (สมรรถนะ+การพัฒนาตนเอง)
-              (คะแนนเต็ม {{ store.competencyDevScore }} คะแนน)</span
+              (คะแนนเต็ม
+              {{
+                store.dataEvaluation.isProbation
+                  ? store.competencyDevProbationScore
+                  : store.competencyDevScore
+              }}
+              คะแนน)</span
             >
             <div class="text-primary q-pl-md">
               {{ (store.competencyScoreVal + store.devScoreVal).toFixed(2) }}
diff --git a/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue b/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
index ab1c0fae6..3cf857864 100644
--- a/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
+++ b/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
@@ -182,7 +182,10 @@ function getData(type: any) {
         } else {
           store.competencyScoreVal =
             weightAvg != 0
-              ? (resultAvg / weightAvg) * store.competencyScore
+              ? (resultAvg / weightAvg) *
+                (store.dataEvaluation.isProbation
+                  ? store.competencyProbationScore
+                  : store.competencyScore)
               : 0;
         }
 
diff --git a/src/modules/14_KPI/store.ts b/src/modules/14_KPI/store.ts
index 987805aa4..53c5e1797 100644
--- a/src/modules/14_KPI/store.ts
+++ b/src/modules/14_KPI/store.ts
@@ -379,10 +379,14 @@ export const useKpiDataStore = defineStore("KPIDataAdmin", () => {
   const indicatorWeight2Total = ref<number>(0); // น้ำหนักรวมมิติที่ 2 ต้องไม่เกิน 20
 
   const indicatorPercentVal = ref<number>(0); // รวมผลการประเมิน (ร้อยละ) ที่ได้จริง
+  const indicatorProbationScore = ref<number>(50); // สรุปผลการประเมินผลสัมฤทธิ์ของงาน ( คะแนนเต็ม indicatorScore คะแนน)
   const indicatorScore = ref<number>(70); // สรุปผลการประเมินผลสัมฤทธิ์ของงาน ( คะแนนเต็ม indicatorScore คะแนน)
   const competencyScore = ref<number>(20); // ผลการประเมินสมรรถนะ (competencyScore คะแนน)
+  const competencyProbationScore = ref<number>(40); // ผลการประเมินสมรรถนะ (competencyScore คะแนน)
   const devScoreVal = ref<number>(0); // ผลการประเมินการพัฒนาตนเองที่ได้กี่คะแนน
   const competencyDevScore = ref<number>(30); // สรุปผลการประเมินพฤติกรรมการปฏิบัติราชการ (สมรรถนะ+การพัฒนาตนเอง) (คะแนนเต็ม competencyDevScore คะแนน)
+  const competencyDevProbationScore = ref<number>(50); // สรุปผลการประเมินพฤติกรรมการปฏิบัติราชการ (สมรรถนะ+การพัฒนาตนเอง) (คะแนนเต็ม competencyDevScore คะแนน)
+
   const devScore = ref<number>(10); // ผลการประเมินการพัฒนาตนเอง (devScore คะแนน)
 
   // SUMMARY EXCLUSIVE CASE
@@ -439,10 +443,13 @@ export const useKpiDataStore = defineStore("KPIDataAdmin", () => {
     //รายการการประเมินผลการปฏิบัติราชการระดับบุคคล
     tabMainevaluator,
     formQuery,
+    indicatorProbationScore,
     yearRound,
     selected,
     statusOptions,
     isUpdate,
     resultsOptions,
+    competencyProbationScore,
+    competencyDevProbationScore,
   };
 });