From 8219a41d9e7337c9a8251d3bb564afbb0d344ffd Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 21 Jan 2025 17:25:57 +0700
Subject: [PATCH 1/8] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_placement/components/probation/MainSurvey.vue   |  2 +-
 .../13_salary/store/SalaryEmployeeListsStore.ts        | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/modules/05_placement/components/probation/MainSurvey.vue b/src/modules/05_placement/components/probation/MainSurvey.vue
index 37d219ebe..076a15051 100644
--- a/src/modules/05_placement/components/probation/MainSurvey.vue
+++ b/src/modules/05_placement/components/probation/MainSurvey.vue
@@ -193,7 +193,7 @@ onMounted(async () => {
             v-model="filterKeyword"
             ref="filterRef"
             outlined
-            placeholder="ค้นหา ชื่อ-นามสกุลผู้ทดลองฯ /ตำแหน่ง"
+            placeholder="ค้นหา ชื่อ - นามสกุลผู้ทดลองฯ /ตำแหน่ง"
             @keydown.enter.prevent="getData()"
             style="width: 350px"
           >
diff --git a/src/modules/13_salary/store/SalaryEmployeeListsStore.ts b/src/modules/13_salary/store/SalaryEmployeeListsStore.ts
index 8dbfd0de4..dcf1abb1c 100644
--- a/src/modules/13_salary/store/SalaryEmployeeListsStore.ts
+++ b/src/modules/13_salary/store/SalaryEmployeeListsStore.ts
@@ -77,23 +77,23 @@ export const useSalaryEmployeeListSDataStore = defineStore(
       },
       {
         id: "emp-04",
-        name: "แบบ ลจ.กทม.1-รายชื่อลูกจ้างผู้สมควรได้เลื่อนขั้นค่าจ้าง",
+        name: "แบบ ลจ. กทม. 1 - รายชื่อลูกจ้างผู้สมควรได้เลื่อนขั้นค่าจ้าง",
       },
       {
         id: "emp-05",
-        name: "แบบ ลจ.กทม.1-1-รายชื่อลูกจ้างผู้สมควรได้รับค่าตอบแทนพิเศษ",
+        name: "แบบ ลจ. กทม. 1 - 1 - รายชื่อลูกจ้างผู้สมควรได้รับค่าตอบแทนพิเศษ",
       },
       {
         id: "emp-06",
-        name: "แบบ ลจ.กทม.2-รายชื่อลูกจ้างผู้ไม่สมควรเลื่อนขั้นค่าจ้าง",
+        name: "แบบ ลจ. กทม. 2 - รายชื่อลูกจ้างผู้ไม่สมควรเลื่อนขั้นค่าจ้าง",
       },
       {
         id: "emp-07",
-        name: "แบบ ลจ.กทม.2-1-รายชื่อลูกจ้างผู้ไม่สมควรได้รับค่าตอบแทนพิเศษ",
+        name: "แบบ ลจ. กทม. 2 - 1 - รายชื่อลูกจ้างผู้ไม่สมควรได้รับค่าตอบแทนพิเศษ",
       },
       {
         id: "emp-08",
-        name: "แบบ ลจ.กทม.3-บัญชีแสดงวันลาในครึ่งปีของลูกจ้าง",
+        name: "แบบ ลจ. กทม. 3 - บัญชีแสดงวันลาในครึ่งปีของลูกจ้าง",
       },
       {
         id: "emp-09",

From 5f0cac12b1872f785a38e722759c17bb284a8ae6 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 22 Jan 2025 10:13:55 +0700
Subject: [PATCH 2/8] fix color pagination

---
 src/modules/06_retirement/components/01_retirement/AddList.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/06_retirement/components/01_retirement/AddList.vue b/src/modules/06_retirement/components/01_retirement/AddList.vue
index 3a71b1169..fbdb99b3f 100644
--- a/src/modules/06_retirement/components/01_retirement/AddList.vue
+++ b/src/modules/06_retirement/components/01_retirement/AddList.vue
@@ -337,7 +337,8 @@ watch(modal, () => {
                 ทั้งหมด {{ totalList }} รายการ
                 <q-pagination
                   v-model="formPagePersonList.page"
-                  color="primary"
+                  active-color="primary"
+                  color="dark"
                   :max="maxPage"
                   :max-pages="5"
                   size="sm"

From 664871b00d7c8ee310dba13c3190b5b4131b490d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 22 Jan 2025 10:25:25 +0700
Subject: [PATCH 3/8] =?UTF-8?q?fix=20/=20=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

---
 .../05_placement/components/probation/MainProbation.vue   | 8 ++++----
 .../components/04_salaryLists/TableTypePending.vue        | 8 ++++----
 .../05_salaryListsEmployee/TableTypePending.vue           | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue
index 4b1c54a1b..8e456569f 100644
--- a/src/modules/05_placement/components/probation/MainProbation.vue
+++ b/src/modules/05_placement/components/probation/MainProbation.vue
@@ -801,19 +801,19 @@ onMounted(async () => {
                       {{
                         `${
                           props.row.orgChild4Name
-                            ? props.row.orgChild4Name + "/"
+                            ? props.row.orgChild4Name + " "
                             : ""
                         }${
                           props.row.orgChild3Name
-                            ? props.row.orgChild3Name + "/"
+                            ? props.row.orgChild3Name + " "
                             : ""
                         }${
                           props.row.orgChild2Name
-                            ? props.row.orgChild2Name + "/"
+                            ? props.row.orgChild2Name + " "
                             : ""
                         }${
                           props.row.orgChild1Name
-                            ? props.row.orgChild1Name + "/"
+                            ? props.row.orgChild1Name + " "
                             : ""
                         }${props.row.orgRootName ? props.row.orgRootName : ""}`
                       }}
diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
index ba5262688..3d980aed8 100644
--- a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
@@ -464,10 +464,10 @@ function onClickViewInfo(type: string, id: string) {
               -
             </div>
             {{
-              `${props.row.child4 ? props.row.child4 + "/" : ""}${
-                props.row.child3 ? props.row.child3 + "/" : ""
-              }${props.row.child2 ? props.row.child2 + "-" : ""}${
-                props.row.child1 ? props.row.child1 + "/" : ""
+              `${props.row.child4 ? props.row.child4 + " " : ""}${
+                props.row.child3 ? props.row.child3 + " " : ""
+              }${props.row.child2 ? props.row.child2 + " " : ""}${
+                props.row.child1 ? props.row.child1 + " " : ""
               }${props.row.root ? props.row.root : ""}`
             }}
           </div>
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
index dcbaf8ccb..aee02168c 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
@@ -481,10 +481,10 @@ watch(
               -
             </div>
             {{
-              `${props.row.child4 ? props.row.child4 + "/" : ""}${
-                props.row.child3 ? props.row.child3 + "/" : ""
-              }${props.row.child2 ? props.row.child2 + "-" : ""}${
-                props.row.child1 ? props.row.child1 + "/" : ""
+              `${props.row.child4 ? props.row.child4 + " " : ""}${
+                props.row.child3 ? props.row.child3 + " " : ""
+              }${props.row.child2 ? props.row.child2 + " " : ""}${
+                props.row.child1 ? props.row.child1 + " " : ""
               }${props.row.root ? props.row.root : ""}`
             }}
           </div>

From b56808ceedf14211805914694b0f4aff943fba41 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 22 Jan 2025 12:50:29 +0700
Subject: [PATCH 4/8] =?UTF-8?q?clone=20=E0=B9=80=E0=B8=A1=E0=B8=99?=
 =?UTF-8?q?=E0=B8=B9=E0=B9=83=E0=B8=AB=E0=B9=89=20"=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=83=E0=B8=AB=E0=B9=89?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81=20(=E0=B8=A5=E0=B8=B9=E0=B8=81?=
 =?UTF-8?q?=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../04_registryPerson/views/detailView.vue    |  13 +-
 src/modules/06_retirement/router.ts           |  12 +
 .../views/08_dismissOrderEmp.vue              | 365 ++++++++++++++++++
 3 files changed, 389 insertions(+), 1 deletion(-)
 create mode 100644 src/modules/06_retirement/views/08_dismissOrderEmp.vue

diff --git a/src/modules/04_registryPerson/views/detailView.vue b/src/modules/04_registryPerson/views/detailView.vue
index a231b2133..af2c693e2 100644
--- a/src/modules/04_registryPerson/views/detailView.vue
+++ b/src/modules/04_registryPerson/views/detailView.vue
@@ -130,6 +130,11 @@ const itemsMenuEmployee = ref<DataOptionSys[]>([
     name: "ถึงแก่กรรม",
     system: "SYS_PASSAWAY",
   },
+  {
+    id: "3",
+    name: "ให้ออกจากราชการ",
+    system: "SYS_DISMISS_EMP",
+  },
 ]);
 
 const uploadUrl = ref<string>(""); //URL อัปโหลดรูป
@@ -842,7 +847,11 @@ onMounted(async () => {
         v-if="
           !storeRegistry.isLeave &&
           empType === '-employee' &&
-          checkPermissionList(['SYS_PROMOTION_EMP', 'SYS_PASSAWAY'])
+          checkPermissionList([
+            'SYS_PROMOTION_EMP',
+            'SYS_PASSAWAY',
+            'SYS_DISMISS_EMP',
+          ])
         "
         size="md"
         rounded
@@ -861,6 +870,8 @@ onMounted(async () => {
                 ? appointEmployeePost()
                 : item.name == 'ถึงแก่กรรม'
                 ? clickPassaway()
+                : item.name == 'ให้ออกจากราชการ'
+                ? outPost()
                 : null
             "
             v-close-popup
diff --git a/src/modules/06_retirement/router.ts b/src/modules/06_retirement/router.ts
index 8c2b30344..a6e9f27e3 100644
--- a/src/modules/06_retirement/router.ts
+++ b/src/modules/06_retirement/router.ts
@@ -54,6 +54,8 @@ const detaildeceasedByid = () =>
 /** รายการให้ออก*/
 const dismissOrder = () =>
   import("@/modules/06_retirement/views/06_dismissOrder.vue");
+const dismissOrderEmp = () =>
+  import("@/modules/06_retirement/views/08_dismissOrderEmp.vue");
 const outDetail = () =>
   import("@/modules/06_retirement/components/06_dismissOrder/Detail.vue");
 const outDetailOnly = () =>
@@ -289,6 +291,16 @@ export default [
       Role: "STAFF",
     },
   },
+  {
+    path: "/retirementEmployee",
+    name: "dismiss-order-emp",
+    component: dismissOrderEmp,
+    meta: {
+      Auth: true,
+      Key: "SYS_DISMISS_EMP",
+      Role: "STAFF",
+    },
+  },
   {
     path: "/retirement/dismiss-order/:id",
     name: "outDetail",
diff --git a/src/modules/06_retirement/views/08_dismissOrderEmp.vue b/src/modules/06_retirement/views/08_dismissOrderEmp.vue
new file mode 100644
index 000000000..df760b20d
--- /dev/null
+++ b/src/modules/06_retirement/views/08_dismissOrderEmp.vue
@@ -0,0 +1,365 @@
+<script setup lang="ts">
+import { ref, onMounted } from "vue";
+import type { QTableProps } from "quasar";
+import { useQuasar } from "quasar";
+import { useRouter } from "vue-router";
+
+import http from "@/plugins/http";
+import config from "@/app.config";
+import { useCounterMixin } from "@/stores/mixin";
+import { checkPermission } from "@/utils/permissions";
+import { useTransferDataStore } from "@/modules/05_placement/store";
+
+import type { ResponseData } from "@/modules/06_retirement/interface/response/out";
+
+import DialogSendToCommand from "@/modules/06_retirement/components/06_dismissOrder/DialogSendToCommand.vue";
+
+/** use */
+const $q = useQuasar();
+const router = useRouter();
+const mixin = useCounterMixin();
+const transferStore = useTransferDataStore();
+const {
+  date2Thai,
+  messageError,
+  showLoader,
+  hideLoader,
+  success,
+  onSearchDataTable,
+  dialogRemove,
+} = mixin;
+const { statusText } = transferStore;
+const modal = ref<boolean>(false);
+
+/** คอลัมน์ที่แสดง */
+const visibleColumns = ref<string[]>([
+  "no",
+  "fullname",
+  "positionLevel",
+  "organizationPositionOld",
+  "createdAt",
+  "status",
+]);
+
+//ค้นหา คอลัมน์ คอลัมน์ที่แสดง
+const filterKeyword = ref<string>("");
+const filterKeyword2 = ref<string>("");
+const filterRef = ref<any>(null);
+
+//ค้นหา คอลัมน์ คอลัมน์ที่แสดง
+const rows = ref<ResponseData[]>([]);
+const rowsData = ref<ResponseData[]>([]);
+const rows2 = ref<ResponseData[]>([]);
+const rowsData2 = ref<ResponseData[]>([]);
+const filters = ref<ResponseData[]>([]);
+const columns = ref<QTableProps["columns"]>([
+  {
+    name: "no",
+    align: "left",
+    label: "ลำดับ",
+    sortable: false,
+    field: "no",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "fullname",
+    align: "left",
+    label: "ชื่อ-นามสกุล",
+    sortable: true,
+    field: "fullname",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return `${row.prefix}${row.firstName} ${row.lastName}`;
+    },
+  },
+  {
+    name: "positionLevel",
+    align: "left",
+    label: "กลุ่มงาน",
+    sortable: true,
+    field: "positionLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      let name = "";
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
+      } else name = "-";
+      return name;
+    },
+  },
+  {
+    name: "organizationPositionOld",
+    align: "left",
+    label: "ตำแหน่ง/สังกัดเดิม",
+    sortable: true,
+    field: "organizationPositionOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "createdAt",
+    align: "left",
+    label: "วันที่ดำเนินการ",
+    sortable: true,
+    field: "createdAt",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val) => date2Thai(val),
+  },
+  {
+    name: "status",
+    align: "left",
+    label: "สถานะ",
+    sortable: true,
+    field: "status",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val) => statusText(val),
+  },
+]);
+
+const pagination = ref({
+  sortBy: "createdAt",
+  descending: true,
+  page: 1,
+  rowsPerPage: 10,
+});
+
+function openModalOrder() {
+  openModal();
+  const row = filters.value.filter(
+    (r: ResponseData) =>
+      (r.status == "WAITTING" ||
+        r.status == "PENDING" ||
+        r.status == "APPROVE") &&
+      r.organizationPositionOld &&
+      r.positionTypeOld &&
+      r.positionLevelOld &&
+      r.positionNumberOld &&
+      r.organization &&
+      r.date
+  );
+  rows2.value = row;
+  rowsData2.value = row;
+}
+
+//นำข้อมูลมาแสดง
+async function getData() {
+  showLoader();
+  await http
+    .get(config.API.retirementOut)
+    .then((res: any) => {
+      const data = res.data.result;
+      rows.value = data;
+      rowsData.value = data;
+      filters.value = data;
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+async function clickDelete(id: string) {
+  dialogRemove($q, async () => {
+    showLoader();
+    await http
+      .delete(config.API.outByid(id))
+      .then(async () => {
+        await getData();
+        success($q, "ลบข้อมูลสำเร็จ");
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(async () => {
+        hideLoader();
+      });
+  });
+}
+
+function openModal() {
+  modal.value = true;
+}
+
+function closeModal() {
+  modal.value = false;
+}
+
+function onSearch() {
+  rows.value = onSearchDataTable(
+    filterKeyword.value,
+    rowsData.value,
+    columns.value ? columns.value : []
+  );
+}
+
+onMounted(async () => {
+  await getData();
+});
+</script>
+
+<template>
+  <div class="toptitle text-dark col-12 row items-center">รายการให้ออก (ลูกจ้าง)</div>
+  <q-card flat bordered class="col-12 q-mt-sm">
+    <q-separator />
+    <div class="row q-pa-md">
+      <div class="col-12">
+        <div class="row col-12">
+          <q-btn
+            v-if="checkPermission($route)?.attrIsUpdate"
+            @click="openModalOrder"
+            size="14px"
+            flat
+            round
+            color="primary"
+            icon="mdi-account-arrow-right"
+          >
+            <q-tooltip>ส่งไปออกคำสั่งให้ออก</q-tooltip>
+          </q-btn>
+
+          <q-space />
+          <div class="row q-col-gutter-sm">
+            <q-input
+              standout
+              dense
+              v-model="filterKeyword"
+              ref="filterRef"
+              outlined
+              placeholder="ค้นหา"
+              @keydown.enter="onSearch"
+            >
+              <template v-slot:append>
+                <q-icon name="search" />
+              </template>
+            </q-input>
+
+            <q-select
+              v-model="visibleColumns"
+              multiple
+              outlined
+              dense
+              options-dense
+              :display-value="$q.lang.table.columns"
+              emit-value
+              map-options
+              :options="columns"
+              option-value="name"
+              style="min-width: 140px"
+            />
+          </div>
+        </div>
+
+        <div class="col-12 q-pt-sm">
+          <d-table
+            :columns="columns"
+            :rows="rows"
+            row-key="id"
+            :visible-columns="visibleColumns"
+            v-model:pagination="pagination"
+          >
+            <template v-slot:header="props">
+              <q-tr :props="props">
+                <q-th auto-width />
+                <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                  <span class="text-weight-medium">{{ col.label }}</span>
+                </q-th>
+              </q-tr>
+            </template>
+            <template v-slot:body="props">
+              <q-tr :props="props">
+                <q-td auto-width>
+                  <q-btn
+                    v-if="checkPermission($route)?.attrIsGet"
+                    flat
+                    dense
+                    round
+                    color="info"
+                    icon="mdi-eye"
+                    @click="
+                      router.push(
+                        `/retirement/dismiss-order-detail/${props.row.id}`
+                      )
+                    "
+                  >
+                    <q-tooltip>รายละเอียด</q-tooltip>
+                  </q-btn>
+                  <q-btn
+                    v-if="
+                      checkPermission($route)?.attrIsGet &&
+                      checkPermission($route)?.attrIsUpdate
+                    "
+                    flat
+                    dense
+                    round
+                    color="edit"
+                    icon="edit"
+                    @click="
+                      router.push(`/retirement/dismiss-order/${props.row.id}`)
+                    "
+                  >
+                    <q-tooltip>แก้ไขข้อมูล</q-tooltip>
+                  </q-btn>
+
+                  <q-btn
+                    v-if="checkPermission($route)?.attrIsDelete"
+                    dense
+                    flat
+                    round
+                    :color="
+                      props.row.status == 'REPORT' || props.row.status == 'DONE'
+                        ? 'grey'
+                        : 'red-7'
+                    "
+                    @click="clickDelete(props.row.id)"
+                    icon="mdi-delete"
+                    :disable="
+                      props.row.status == 'REPORT' || props.row.status == 'DONE'
+                    "
+                  >
+                    <q-tooltip>ลบข้อมูล</q-tooltip>
+                  </q-btn>
+                </q-td>
+                <q-td v-for="col in props.cols" :key="col.id">
+                  <div v-if="col.name === 'no'">
+                    {{ props.rowIndex + 1 }}
+                  </div>
+
+                  <div
+                    v-else
+                    :class="
+                      col.name === 'organizationPositionOld'
+                        ? 'table_ellipsis2'
+                        : ''
+                    "
+                  >
+                    {{ col.value ? col.value : "-" }}
+                  </div>
+                </q-td>
+              </q-tr>
+            </template>
+          </d-table>
+        </div>
+      </div>
+    </div>
+  </q-card>
+
+  <DialogSendToCommand
+    v-model:modal="modal"
+    :closeModal="closeModal"
+    v-model:rows="rows2"
+    v-model:rowsData="rowsData2"
+    v-model:filterKeyword2="filterKeyword2"
+    :fecthlistRecevice="getData"
+  />
+</template>
+<style scoped lang="scss"></style>

From 286d69f9cf55147395141128b5921bf71b6ef315 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 22 Jan 2025 12:55:49 +0700
Subject: [PATCH 5/8] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../13_salary/components/04_salaryLists/TableTypePending.vue    | 2 +-
 .../components/05_salaryListsEmployee/TableTypePending.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
index 3d980aed8..745bb991e 100644
--- a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue
@@ -121,7 +121,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "result",
     align: "center",
-    label: "ผลการประเมิน ฯ",
+    label: "ผลการประเมินฯ",
     sortable: false,
     field: "result",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
index aee02168c..9b0563dfc 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue
@@ -132,7 +132,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "result",
     align: "center",
-    label: "ผลการประเมิน ฯ",
+    label: "ผลการประเมินฯ",
     sortable: false,
     field: "result",
     headerStyle: "font-size: 14px",

From 8b200d35751c7518ccaf0ff7a80d0aee6323832a Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 22 Jan 2025 14:41:18 +0700
Subject: [PATCH 6/8] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=94=E0=B8=8B=E0=B9=89=E0=B8=B2=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/05_salaryListsEmployee/TableTypeOther.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
index e82845b16..3fc89fbeb 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
@@ -158,7 +158,7 @@ const baseColumns = ref<QTableProps["columns"]>([
   },
   {
     name: "remark",
-    align: "center",
+    align: "left",
     label: "หมายเหตุ",
     sortable: false,
     field: "remark",

From 0de55b9a4a98712d72b50ad4fc0e39bee30cac55 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 22 Jan 2025 15:22:08 +0700
Subject: [PATCH 7/8] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../13_salary/store/SalaryEmployeeListsStore.ts  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/modules/13_salary/store/SalaryEmployeeListsStore.ts b/src/modules/13_salary/store/SalaryEmployeeListsStore.ts
index dcf1abb1c..659cee9a4 100644
--- a/src/modules/13_salary/store/SalaryEmployeeListsStore.ts
+++ b/src/modules/13_salary/store/SalaryEmployeeListsStore.ts
@@ -139,7 +139,7 @@ export const useSalaryEmployeeListSDataStore = defineStore(
       },
       {
         id: "emp2-02",
-        name: "รายชื่อลูกจ้างประจำกรุงเทพมหานครผู้ครองตำแหน่ง ณ วันที่ ๑ กันยายน",
+        name: "รายชื่อลูกจ้างประจำกรุงเทพมหานครผู้ครองตำแหน่ง ณ วันที่ 1 กันยายน",
       },
       {
         id: "emp2-03",
@@ -147,23 +147,23 @@ export const useSalaryEmployeeListSDataStore = defineStore(
       },
       {
         id: "emp2-04",
-        name: "บัญชีรายชื่อลูกจ้างประจำกรุงเทพมหานครผู้สมควรได้เลื่อนขั้นค่าจ้าง (แบบ ลจ.กทม.๑)",
+        name: "บัญชีรายชื่อลูกจ้างประจำกรุงเทพมหานครผู้สมควรได้เลื่อนขั้นค่าจ้าง (แบบ ลจ. กทม. 1)",
       },
       {
         id: "emp2-05",
-        name: "บัญชีรายชื่อลูกจ้างประจำกรุงเทพมหานครผู้สมควรได้รับค่าตอบแทนพิเศษ (แบบ ลจ.กทม.๑/๑)",
+        name: "บัญชีรายชื่อลูกจ้างประจำกรุงเทพมหานครผู้สมควรได้รับค่าตอบแทนพิเศษ (แบบ ลจ. กทม. 1/1)",
       },
       {
         id: "emp2-06",
-        name: "บัญชีรายชื่อลูกจ้างประจำกรุงเทพมหานครผู้ไม่สมควรเลื่อนขั้นค่าจ้าง (แบบ ลจ.กทม.๒)",
+        name: "บัญชีรายชื่อลูกจ้างประจำกรุงเทพมหานครผู้ไม่สมควรเลื่อนขั้นค่าจ้าง (แบบ ลจ. กทม. 2)",
       },
       {
         id: "emp2-07",
-        name: "บัญชีรายชื่อลูกจ้างประจำกรุงเทพมหานครผู้ไม่สมควรได้รับค่าตอบแทนพิเศษ (แบบ ลจ.กทม.๒/๑)",
+        name: "บัญชีรายชื่อลูกจ้างประจำกรุงเทพมหานครผู้ไม่สมควรได้รับค่าตอบแทนพิเศษ (แบบ ลจ. กทม. 2/1)",
       },
       {
         id: "emp2-08",
-        name: "บัญชีแสดงวันลาในครึ่งปีที่แล้วมาของลูกจ้างประจำกรุงเทพมหานคร (แบบ ลจ.กทม.๓)",
+        name: "บัญชีแสดงวันลาในครึ่งปีที่แล้วมาของลูกจ้างประจำกรุงเทพมหานคร (แบบ ลจ. กทม. 3)",
       },
       {
         id: "emp2-09",
@@ -179,11 +179,11 @@ export const useSalaryEmployeeListSDataStore = defineStore(
       },
       {
         id: "emp2-13",
-        name: "บัญชีรายละเอียดแสดงการเลื่อนขั้นค่าจ้างและให้ลูกจ้างประจำกรุงเทพมหานครได้รับอัตราค่าจ้างสูงกว่า ฯ ที่เกษียณอายุราชการ ในสิ้นปีงบประมาณ (แนบท้ายคำสั่ง)",
+        name: "บัญชีรายละเอียดแสดงการเลื่อนขั้นค่าจ้างและให้ลูกจ้างประจำกรุงเทพมหานครได้รับอัตราค่าจ้างสูงกว่าฯ ที่เกษียณอายุราชการ ในสิ้นปีงบประมาณ (แนบท้ายคำสั่ง)",
       },
       {
         id: "emp2-13",
-        name: "บัญชีรายละเอียดแสดงการเลื่อนขั้นค่าจ้างและให้ลูกจ้างประจำกรุงเทพมหานครได้รับอัตราค่าจ้างสูงกว่า ฯ ที่เกษียณอายุราชการ ในสิ้นปีงบประมาณ (แนบท้ายคำสั่ง PDF)",
+        name: "บัญชีรายละเอียดแสดงการเลื่อนขั้นค่าจ้างและให้ลูกจ้างประจำกรุงเทพมหานครได้รับอัตราค่าจ้างสูงกว่าฯ ที่เกษียณอายุราชการ ในสิ้นปีงบประมาณ (แนบท้ายคำสั่ง PDF)",
         type: "pdf",
       },
       {

From 047f711bbfaa133cab469f5b9bae414cc6f30510 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 22 Jan 2025 17:22:46 +0700
Subject: [PATCH 8/8] =?UTF-8?q?fix=20=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=97?=
 =?UTF-8?q?=E0=B8=94=E0=B8=A5=E0=B8=AD=E0=B8=87=E0=B8=9B=E0=B8=8F=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=AB=E0=B8=99=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A3=E0=B8=B2=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/probation/FormAssign.vue       |  5 ++--
 .../probation/FormEvaluation/FormReport.vue   | 23 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue
index b31b3ad2d..f9c183113 100644
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@@ -1145,11 +1145,12 @@ onMounted(async () => {
             </q-menu>
           </q-btn>
 
-          <div v-if="!isEdit && !isCheckFile">
+          <div v-if="!isEdit">
             <q-btn
               v-if="
                 !checkRoutePermisson &&
-                probationStore.dataPermissions?.tab1.isEdit
+                probationStore.dataPermissions?.tab1.isEdit &&
+                !isCheckFile
               "
               dense
               flat
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
index a8507d7a3..6e9a31f7f 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
@@ -795,17 +795,6 @@ onMounted(() => {
       </div>
     </q-form>
 
-    <FormUploadFile
-      :group="`รายงานผลครั้งที่${props.tab?.charAt(4)}`"
-      v-model:is-check-file="isCheckFile"
-      :check-route-permisson="checkRoutePermisson"
-      :data-permissions="
-        probationStore.dataPermissions?.tab6.isEdit
-          ? probationStore.dataPermissions?.tab6.isEdit
-          : false
-      "
-    />
-
     <q-toolbar
       class="text-primary"
       v-if="
@@ -817,6 +806,18 @@ onMounted(() => {
       <q-space />
       <q-btn label="บันทึก" color="secondary" @click="savaForm" />
     </q-toolbar>
+
+    <FormUploadFile
+      v-else
+      :group="`รายงานผลครั้งที่${props.tab?.charAt(4)}`"
+      v-model:is-check-file="isCheckFile"
+      :check-route-permisson="checkRoutePermisson"
+      :data-permissions="
+        probationStore.dataPermissions?.tab6.isEdit
+          ? probationStore.dataPermissions?.tab6.isEdit
+          : false
+      "
+    />
   </div>
 </template>