From 6ce1d01ee48165a3d0256f360b94b48986ec163f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 2 Dec 2025 17:43:04 +0700
Subject: [PATCH 1/3] fix

---
 src/modules/11_discipline/components/4_Result/EditPage.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/11_discipline/components/4_Result/EditPage.vue b/src/modules/11_discipline/components/4_Result/EditPage.vue
index 4250d7a48..fb8e9ab73 100644
--- a/src/modules/11_discipline/components/4_Result/EditPage.vue
+++ b/src/modules/11_discipline/components/4_Result/EditPage.vue
@@ -220,6 +220,8 @@ async function fetchDetailInvestigate() {
         dataList.investigationDaysExtend;
       dataInvestigatefacts.organizationId = dataList.organizationId;
       dataInvestigatefacts.organization = dataList.organization;
+      dataInvestigatefacts.investigationExtendHistory =
+        dataList.investigationExtendHistory;
     })
     .catch((err) => {
       messageError($q, err);

From 626cc338f89b44d6d2d2c7b8108126adae52cb72 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Dec 2025 09:33:58 +0700
Subject: [PATCH 2/3] fix:command-type-code-array

---
 src/modules/13_salary/views/04_salaryLists.vue       | 12 +++++++++++-
 .../13_salary/views/05_salaryListsEmployee.vue       |  3 ++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/modules/13_salary/views/04_salaryLists.vue b/src/modules/13_salary/views/04_salaryLists.vue
index 29281be7b..9644131ca 100644
--- a/src/modules/13_salary/views/04_salaryLists.vue
+++ b/src/modules/13_salary/views/04_salaryLists.vue
@@ -80,6 +80,15 @@ const titleCommand = computed(() => {
   return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นเงินเดือน ${txt}`;
 });
 
+//ประเภทคำสั่ง
+const commandTypeCodeArray = computed(() => {
+  if (roundFilter.value?.shortCode === "OCT") {
+    return ["C-PM-33", "C-PM-34", "C-PM-35"];
+  } else {
+    return ["C-PM-33", "C-PM-34"];
+  }
+});
+
 /** function เรียกข้อมูลรอบการขึ้นเงินเดือน*/
 async function getRound() {
   showLoader();
@@ -644,13 +653,14 @@ onMounted(async () => {
     />
   </q-card>
 
+  <!-- '' -->
   <DialogCommand
     v-model:modal="modalCommand"
     v-model:root-id="agencyFilter"
     v-model:is-officer="isOfficer"
     v-model:is-staff="isStaff"
     system-name="SALARY"
-    :command-type-code-array="['C-PM-33', 'C-PM-34', 'C-PM-35']"
+    :command-type-code-array="commandTypeCodeArray"
     :salary-period-id="salaryPeriodId"
     :title-command="titleCommand"
     :is-deputy="isDeputy"
diff --git a/src/modules/13_salary/views/05_salaryListsEmployee.vue b/src/modules/13_salary/views/05_salaryListsEmployee.vue
index 559ad3e2f..748d6be48 100644
--- a/src/modules/13_salary/views/05_salaryListsEmployee.vue
+++ b/src/modules/13_salary/views/05_salaryListsEmployee.vue
@@ -586,13 +586,14 @@ onMounted(async () => {
     />
   </q-card>
 
+  <!-- 'C-PM-45', 'C-PM-46' -->
   <DialogCommand
     v-model:modal="modalCommand"
     v-model:root-id="agencyFilter"
     v-model:is-officer="isOfficer"
     v-model:is-staff="isStaff"
     system-name="SALARY_EMP"
-    :command-type-code-array="['C-PM-36', 'C-PM-37', 'C-PM-45', 'C-PM-46']"
+    :command-type-code-array="['C-PM-36', 'C-PM-37']"
     :salary-period-id="salaryPeriodId"
     :title-command="titleCommand"
   />

From 628befff9387a86d5a049092444c31abb920fbe3 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Dec 2025 09:54:16 +0700
Subject: [PATCH 3/3] fix: commandTypeCodeArray  shortCode === OCT

---
 .../13_salary/views/05_salaryListsEmployee.vue       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/modules/13_salary/views/05_salaryListsEmployee.vue b/src/modules/13_salary/views/05_salaryListsEmployee.vue
index 748d6be48..3c7a395c0 100644
--- a/src/modules/13_salary/views/05_salaryListsEmployee.vue
+++ b/src/modules/13_salary/views/05_salaryListsEmployee.vue
@@ -79,6 +79,15 @@ const titleCommand = computed(() => {
   return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นค่าจ้าง${txt}`;
 });
 
+//ประเภทคำสั่ง
+const commandTypeCodeArray = computed(() => {
+  if (roundFilter.value?.shortCode === "OCT") {
+    return ["C-PM-36", "C-PM-37", "C-PM-45", "C-PM-46"];
+  } else {
+    return ["C-PM-36", "C-PM-37"];
+  }
+});
+
 /**
  * function เรียกข้อมูลรอบการขึ้นค่าจ้าง
  */
@@ -586,14 +595,13 @@ onMounted(async () => {
     />
   </q-card>
 
-  <!-- 'C-PM-45', 'C-PM-46' -->
   <DialogCommand
     v-model:modal="modalCommand"
     v-model:root-id="agencyFilter"
     v-model:is-officer="isOfficer"
     v-model:is-staff="isStaff"
     system-name="SALARY_EMP"
-    :command-type-code-array="['C-PM-36', 'C-PM-37']"
+    :command-type-code-array="commandTypeCodeArray"
     :salary-period-id="salaryPeriodId"
     :title-command="titleCommand"
   />