From beb1522145ded82196764bb0cdb1c16f7e395f1d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 1 Nov 2024 13:04:37 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20text=20?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B9=80=E0=B8=87=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/13_salary/views/04_salaryLists.vue    | 15 ++++++++++++---
 .../13_salary/views/05_salaryListsEmployee.vue    | 14 ++++++++++++--
 .../components/DialogCreateCommandORG.vue         | 10 +++++++++-
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/modules/13_salary/views/04_salaryLists.vue b/src/modules/13_salary/views/04_salaryLists.vue
index a7d39c714..1937e7652 100644
--- a/src/modules/13_salary/views/04_salaryLists.vue
+++ b/src/modules/13_salary/views/04_salaryLists.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
+import { computed, onMounted, ref } from "vue";
 import { useQuasar } from "quasar";
 
 import { useSalaryListSDataStore } from "@/modules/13_salary/store/SalaryListsStore";
@@ -55,6 +55,15 @@ const lastPage = ref<number>(0);
 const modalCommand = ref<boolean>(false);
 const isOfficer = ref<boolean>(false);
 const isStaff = ref<boolean>(false);
+const titleCommand = computed(() => {
+  return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นเงินเดือน ${
+    roundFilter.value?.shortCode === "SPECIAL"
+      ? roundFilter.value?.name
+        ? roundFilter.value?.name
+        : ""
+      : `1 ${roundFilter.value?.name ? roundFilter.value?.name : ""}`
+  } `;
+});
 
 /**
  * function เรียกข้อมูลรอบการขึ้นเงินเดือน
@@ -246,7 +255,6 @@ async function fetchSalalyPeriod(
       .post(config.API.salaryListPeriodLatest, body)
       .then(async (res) => {
         const data = await res.data.result;
-        console.log(data);
 
         if (roundFilter.value.shortCode !== "SPECIAL") {
           if (Object.values(data).includes(null)) {
@@ -464,7 +472,7 @@ onMounted(async () => {
       <q-select
         v-if="roundFilter ? roundFilter.shortCode !== 'SPECIAL' : false"
         v-model="snapFilter"
-        label="รอบ"
+        label="ราชชื่อรอบ"
         dense
         outlined
         emit-value
@@ -565,6 +573,7 @@ onMounted(async () => {
     system-name="SALARY"
     :command-type-code-array="['C-PM-33', 'C-PM-34', 'C-PM-35']"
     :salary-period-id="salaryPeriodId"
+    :title-command="titleCommand"
   />
 </template>
 
diff --git a/src/modules/13_salary/views/05_salaryListsEmployee.vue b/src/modules/13_salary/views/05_salaryListsEmployee.vue
index f18d03b44..e367af9b5 100644
--- a/src/modules/13_salary/views/05_salaryListsEmployee.vue
+++ b/src/modules/13_salary/views/05_salaryListsEmployee.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref, nextTick } from "vue";
+import { onMounted, ref, nextTick, computed } from "vue";
 import { useQuasar } from "quasar";
 
 import { useSalaryEmployeeListSDataStore } from "@/modules/13_salary/store/SalaryEmployeeListsStore";
@@ -57,6 +57,15 @@ const nextPage = ref<number>(1);
 const modalCommand = ref<boolean>(false);
 const isOfficer = ref<boolean>(false);
 const isStaff = ref<boolean>(false);
+const titleCommand = computed(() => {
+  return `ปีงบประมาณ ${year.value + 543} รอบการขึ้นเงินเดือน ${
+    roundFilter.value?.shortCode === "SPECIAL"
+      ? roundFilter.value?.name
+        ? roundFilter.value?.name
+        : ""
+      : `1 ${roundFilter.value?.name ? roundFilter.value?.name : ""}`
+  } `;
+});
 
 /**
  * function เรียกข้อมูลรอบการขึ้นค่าจ้าง
@@ -463,7 +472,7 @@ onMounted(async () => {
       <q-select
         v-if="roundFilter ? roundFilter.shortCode !== 'SPECIAL' : false"
         v-model="snapFilter"
-        label="รอบ"
+        label="ราชชื่อรอบ"
         dense
         outlined
         emit-value
@@ -557,6 +566,7 @@ onMounted(async () => {
     system-name="SALARY_EMP"
     :command-type-code-array="['C-PM-36', 'C-PM-37']"
     :salary-period-id="salaryPeriodId"
+    :title-command="titleCommand"
   />
 </template>
 
diff --git a/src/modules/18_command/components/DialogCreateCommandORG.vue b/src/modules/18_command/components/DialogCreateCommandORG.vue
index ef2aba8f6..5ae1c39c8 100644
--- a/src/modules/18_command/components/DialogCreateCommandORG.vue
+++ b/src/modules/18_command/components/DialogCreateCommandORG.vue
@@ -41,6 +41,7 @@ const props = defineProps({
   systemName: String, // ไอดีประเภทคำสั่ง
   orgPublishDate: { type: Date || undefined, defult: undefined },
   salaryPeriodId: { type: String, defult: "" }, // รอบเงินเดือน
+  titleCommand: { type: String, defult: "" },
 });
 
 const commandOp = ref<ListCommand[]>([]); // ประเภทคำสั่ง
@@ -281,7 +282,14 @@ watch(modal, async () => {
   <q-dialog v-model="modal" persistent>
     <q-card style="min-width: 50vw">
       <q-form greedy @submit.prevent @validation-success="onSubmit">
-        <DialogHeader :tittle="'สร้างคำสั่ง'" :close="closeModal" />
+        <DialogHeader
+          :tittle="`สร้างคำสั่ง ${
+            props.systemName === 'SALARY' || props.systemName === 'SALARY_EMP'
+              ? props.titleCommand
+              : ''
+          }`"
+          :close="closeModal"
+        />
         <q-separator />
         <q-card-section style="max-height: 50vh" class="scroll">
           <div class="row q-sm q-col-gutter-sm">