Merge branch 'develop' into dev

* develop:
  fix: commandTypeCodeArray  shortCode === OCT
  fix:command-type-code-array
  fix

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);

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"

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 เรียกข้อมูลรอบการขึ้นค่าจ้าง
  */
@@ -592,7 +601,7 @@ onMounted(async () => {
     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="commandTypeCodeArray"
     :salary-period-id="salaryPeriodId"
     :title-command="titleCommand"
   />