From 2a0760997c2e6701dfba6f62810c165963bd9dfe Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 9 Jul 2024 10:00:49 +0700
Subject: [PATCH 01/10] fixing kpi toString

---
 src/modules/14_KPI/components/Tab/04_Result.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/modules/14_KPI/components/Tab/04_Result.vue b/src/modules/14_KPI/components/Tab/04_Result.vue
index 6c87c0b0e..ebe047324 100644
--- a/src/modules/14_KPI/components/Tab/04_Result.vue
+++ b/src/modules/14_KPI/components/Tab/04_Result.vue
@@ -171,11 +171,17 @@ function getData() {
       developmentMethod.value = data.developEvaluator;
       developmentPeriod.value = data.timeEvaluator;
       evaluatorComment.value = data.reasonEvaluator;
-      superiorCommentCheck.value = data.isReasonCommander.toString();
+      superiorCommentCheck.value =
+        data.isReasonCommander != null
+          ? data.isReasonCommander.toString()
+          : null;
 
       superiorComment.value = data.reasonCommander;
 
-      additionalSuperiorCheck.value = data.isReasonCommanderHigh.toString();
+      additionalSuperiorCheck.value =
+        data.isReasonCommanderHigh != null
+          ? data.isReasonCommanderHigh.toString()
+          : null;
       additionalSuperiorComment.value = data.reasonCommanderHigh;
       result1.value = data.totalPoint1;
       result2.value = data.totalPoint2_1 + data.totalPoint2_2;

From 81135ab9d5b71d76e4affd98d01dc974c2656fca Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 9 Jul 2024 10:07:37 +0700
Subject: [PATCH 02/10] build to .me

---
 .github/workflows/release.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 096fab0e2..b913841df 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -9,8 +9,8 @@ env:
   REGISTRY: docker.frappet.com
   IMAGE_NAME: ehr/bma-ehr-app
   DEPLOY_HOST: frappet.com
-  COMPOSE_PATH: /home/frappet/docker/bma-ehr
-  # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr
+  # COMPOSE_PATH: /home/frappet/docker/bma-ehr
+  COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr
 jobs:
   # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=latest -s DOCKER_USER=kittapath@frappet.com -s DOCKER_PASS=P@ssw0rd -s SSH_PASSWORD=FPTadmin2357
   release-test:

From 8fec24c9101af2544ebc13a271d5444c4e5d0268 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 9 Jul 2024 10:10:36 +0700
Subject: [PATCH 03/10] back

---
 .github/workflows/release.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index b913841df..096fab0e2 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -9,8 +9,8 @@ env:
   REGISTRY: docker.frappet.com
   IMAGE_NAME: ehr/bma-ehr-app
   DEPLOY_HOST: frappet.com
-  # COMPOSE_PATH: /home/frappet/docker/bma-ehr
-  COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr
+  COMPOSE_PATH: /home/frappet/docker/bma-ehr
+  # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr
 jobs:
   # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=latest -s DOCKER_USER=kittapath@frappet.com -s DOCKER_PASS=P@ssw0rd -s SSH_PASSWORD=FPTadmin2357
   release-test:

From 8ef9c5d7bc795552f766fb4245d1d7a76ffa51d9 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 9 Jul 2024 10:17:37 +0700
Subject: [PATCH 04/10] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=96=E0=B8=B7=E0=B8=AD=E0=B8=84?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=AD=E0=B8=87=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogHistory.vue              | 329 +++++++++---------
 .../interface/response/History.ts             |  23 ++
 2 files changed, 196 insertions(+), 156 deletions(-)
 create mode 100644 src/modules/04_registryNew/interface/response/History.ts

diff --git a/src/modules/04_registryNew/components/DialogHistory.vue b/src/modules/04_registryNew/components/DialogHistory.vue
index 1879c65e4..7ad3d49fa 100644
--- a/src/modules/04_registryNew/components/DialogHistory.vue
+++ b/src/modules/04_registryNew/components/DialogHistory.vue
@@ -5,23 +5,43 @@ import { useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-/** importType*/
-import type { DataOption } from "@/modules/04_registryNew/interface/index/Main";
+/**
+ * importType*
+ */
+import type { QTableProps } from "quasar";
 import type { QForm } from "quasar";
+import type { DataOption } from "@/modules/04_registryNew/interface/index/Main";
+import type {
+  HistoryPos,
+  Position,
+} from "@/modules/04_registryNew/interface/response/History";
 
-/** importStore*/
+/**
+ * import components
+ */
+import DialogHeader from "@/components/DialogHeader.vue";
+
+/**
+ * importStore
+ */
 import { useCounterMixin } from "@/stores/mixin";
 
-/** use*/
+/**
+ *  use
+ */
 const myForm = ref<QForm>();
 const router = useRouter();
 const $q = useQuasar();
-const { showLoader, hideLoader, messageError, date2Thai, dialogMessageNotify } =
-  useCounterMixin();
+const { showLoader, hideLoader, messageError, date2Thai } = useCounterMixin();
 
-/**props*/
+/**
+ * props
+ */
 const modal = defineModel<boolean>("modal", { required: true });
 
+/**
+ * ตัวแปร
+ */
 const employeeClass = ref<string>("");
 const typeKeyword = ref<string>("");
 const Keyword = ref<string>("");
@@ -35,7 +55,12 @@ const typeKeywordOps = ref<DataOption[]>([
   { id: "position", name: "ตำแหน่ง" },
 ]);
 const positionOps = ref<DataOption[]>([]);
-const columns = ref<any["columns"]>([
+const options = ref<DataOption[]>([]);
+
+/**
+ * Table
+ */
+const columns = ref<QTableProps["columns"]>([
   {
     name: "no",
     label: "ลำดับ",
@@ -81,18 +106,26 @@ const columns = ref<any["columns"]>([
     align: "left",
     label: "วันที่ถือครอง",
     field: "date",
+    format: (val, row) => `${date2Thai(val)}`,
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
 ]);
-const rows = ref<any>([]);
+const rows = ref<HistoryPos[]>([]);
 
+/**
+ * function fetch ข้อมูลตำแหน่ง ข้าราชการ
+ */
 function fecthPositionOfficer() {
   http
     .get(config.API.listPositionPathHistory)
     .then((res) => {
       let data = res.data.result.items;
-      positionOps.value = data.map((e: any) => ({ id: e.id, name: e.name }));
+
+      positionOps.value = data.map((e: Position) => ({
+        id: e.id,
+        name: e.name,
+      }));
       options.value = positionOps.value;
     })
     .catch((err) => {
@@ -100,12 +133,20 @@ function fecthPositionOfficer() {
     });
 }
 
+/**
+ * function fetch ข้อมูลตำแหน่ง ลูกจ้างประจำ
+ */
 function fetchPositionPerm() {
   http
     .get(config.API.listPositionEmployeePositionHistory)
     .then((res) => {
       let data = res.data.result.items;
-      positionOps.value = data.map((e: any) => ({ id: e.id, name: e.name }));
+      console.log(data);
+
+      positionOps.value = data.map((e: Position) => ({
+        id: e.id,
+        name: e.name,
+      }));
       options.value = positionOps.value;
     })
     .catch((err) => {
@@ -113,12 +154,20 @@ function fetchPositionPerm() {
     });
 }
 
+/**
+ * function เปลี่ยนประเภท
+ */
 function changeEmployeeClass() {
   typeKeyword.value = "";
   Keyword.value = "";
   positionKeyword.value = "";
   rows.value = [];
 }
+
+/**
+ * function เลือกฟิลด์ที่จะค้นหา
+ * @param typeKeyword  ประเภทฟิลด์
+ */
 function selectTypeKeyword(typeKeyword: string) {
   positionOps.value = [];
   positionKeyword.value = "";
@@ -131,6 +180,10 @@ function selectTypeKeyword(typeKeyword: string) {
   }
 }
 
+/**
+ * function ค้นหาประวัติถือครองตำแหน่ง
+ * @param type ประเภทข่าราชการ
+ */
 function clickSearch(type: string) {
   myForm.value!.validate().then((result: boolean) => {
     if (result) {
@@ -151,16 +204,15 @@ function clickSearch(type: string) {
         .then((res) => {
           let data = res.data.result;
           if (data.length !== 0) {
-            rows.value = data.map((e: any) => ({
+            rows.value = data.map((e: HistoryPos) => ({
               id: e.id,
               citizenId: e.citizenId,
               name: e.fullName,
               posNo: e.posNo,
               position: e.position,
-              date: date2Thai(e.date),
+              date: e.date,
             }));
           } else {
-            dialogMessageNotify($q, "ไม่มีข้อมูลที่ต้องการค้นหา");
             rows.value = [];
           }
         })
@@ -174,8 +226,13 @@ function clickSearch(type: string) {
     }
   });
 }
-const options = ref<any>([]);
-function filterFn(val: string, update: any) {
+
+/**
+ * function ค้นหาข่อมูล Optiion
+ * @param val คำค้นหา
+ * @param update function
+ */
+function filterFn(val: string, update: Function) {
   if (val === "") {
     update(() => {
       options.value = positionOps.value;
@@ -189,6 +246,11 @@ function filterFn(val: string, update: any) {
     });
   }
 }
+
+/**
+ * function redirect ไปทะเบียนประวัติ
+ * @param id
+ */
 function clickRedirect(id: string) {
   const url =
     employeeClass.value === "officer"
@@ -197,42 +259,32 @@ function clickRedirect(id: string) {
   router.push(`${url}/${id}`);
 }
 
-const paging = ref<boolean>(true);
-const pagination = ref({
-  sortBy: "order",
-  descending: false,
-  page: 1,
-  rowsPerPage: 10,
-});
-const paginationLabel = (start: number, end: number, total: number) => {
-  if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
-  else return start + "-" + end + " ใน " + total;
-};
+/**
+ * function ปิด popup
+ */
+function closeDialog() {
+  modal.value = false;
+  employeeClass.value = "";
+  typeKeyword.value = "";
+  Keyword.value = "";
+  positionKeyword.value = "";
+  rows.value = [];
+}
 </script>
 
 <template>
   <q-dialog v-model="modal">
     <q-card style="width: 850px; max-width: 80vw">
-      <q-toolbar>
-        <q-toolbar-title class="text-subtitle2 text-bold"
-          >ประวัติถือครองตำแหน่ง</q-toolbar-title
-        >
-        <q-btn
-          icon="close"
-          unelevated
-          round
-          dense
-          v-close-popup
-          style="color: #ff8080; background-color: #ffdede"
-        />
-      </q-toolbar>
+      <DialogHeader :tittle="'ประวัติถือครองตำแหน่ง'" :close="closeDialog" />
+
       <q-separator />
 
-      <div class="dialog-card-contain">
-        <q-card-section class="q-pa-sm">
-          <q-form ref="myForm">
-            <div class="col-12 bg-grey-2 q-pa-sm">
-              <div class="q-col-gutter-xs row no-wrap">
+      <q-card-section class="q-pa-sm">
+        <q-form ref="myForm">
+          <div class="col-12 bg-grey-2 q-pa-sm">
+            <div class="col-12 row q-pb-sm q-col-gutter-sm items-center"></div>
+            <div class="q-col-gutter-xs row no-wrap">
+              <div class="col-4">
                 <q-select
                   hide-bottom-space
                   :rules="[(val:string) => !!val || `${'กรุณาเลือก ประเภท'}`]"
@@ -250,6 +302,8 @@ const paginationLabel = (start: number, end: number, total: number) => {
                   input-debounce="0"
                   @update:model-value="changeEmployeeClass"
                 />
+              </div>
+              <div class="col-3">
                 <q-select
                   hide-bottom-space
                   :rules="[(val:string) => !!val || `${'กรุณาเลือก ฟิลด์ที่จะค้น'}`]"
@@ -267,8 +321,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
                   input-debounce="0"
                   @update:model-value="selectTypeKeyword(typeKeyword)"
                 />
+              </div>
+
+              <div class="col" v-if="typeKeyword === 'no'">
                 <q-input
-                  v-if="typeKeyword === 'no'"
                   borderless
                   outlined
                   dense
@@ -278,8 +334,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
                   :rules="[(val:string) => !!val || `${'กรุณากรอก ตำแหน่งเลขที่'}`]"
                   hide-bottom-space
                 />
+              </div>
+
+              <div class="col" v-if="typeKeyword === 'position'">
                 <q-select
-                  v-if="typeKeyword === 'position'"
                   hide-bottom-space
                   :rules="[(val:string) => !!val || `${'กรุณาเลือก ตำแหน่ง'}`]"
                   outlined
@@ -304,119 +362,78 @@ const paginationLabel = (start: number, end: number, total: number) => {
                     </q-item>
                   </template></q-select
                 >
-                <q-space />
-                <div class="col-2 row">
-                  <q-btn
-                    dense
-                    color="primary"
-                    icon="mdi-magnify"
-                    label="ค้นหา"
-                    class="col-12"
-                    @click="clickSearch(employeeClass)"
-                  />
-                </div>
               </div>
+
+              <q-space />
+
+              <q-btn
+                color="primary"
+                icon="mdi-magnify"
+                label="ค้นหา"
+                @click="clickSearch(employeeClass)"
+              />
             </div>
-          </q-form>
-        </q-card-section>
-      </div>
+          </div>
 
-      <div class="col-12 q-px-sm q-pb-sm">
-        <q-table
-          flat
-          dense
-          bordered
-          :rows="rows"
-          :columns="columns"
-          row-key="order"
-          class="custom-header-table"
-          no-data-label="ไม่มีข้อมูล"
-          :pagination-label="paginationLabel"
-          v-model:pagination="pagination"
-        >
-          <template v-slot:header="props">
-            <q-tr :props="props">
-              <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                <div class="text-grey-7 text-weight-medium">
-                  <span class="row">{{ col.label }}</span>
-                </div>
-              </q-th>
-            </q-tr>
-          </template>
-          <template v-slot:body="props">
-            <q-tr :props="props" class="cursor-pointer">
-              <q-td key="no" :props="props"> {{ props.rowIndex + 1 }}</q-td>
-              <q-td key="order" :props="props">{{ props.row.order }} </q-td>
-              <q-td
-                key="citizenId"
-                class="text-primary"
-                @click="clickRedirect(props.row.id)"
-                :props="props"
-                >{{ props.row.citizenId }}</q-td
-              >
-              <q-td
-                key="name"
-                class="text-primary"
-                @click="clickRedirect(props.row.id)"
-                :props="props"
-                >{{ props.row.name }}</q-td
-              >
-
-              <q-td key="posNo" :props="props">{{ props.row.posNo }}</q-td>
-              <q-td key="position" :props="props">{{
-                props.row.position
-              }}</q-td>
-              <q-td key="date" :props="props">{{ props.row.date }}</q-td>
-            </q-tr>
-          </template>
-          <template v-slot:pagination="scope">
-            <q-pagination
-              v-model="pagination.page"
-              color="primary"
-              :max="scope.pagesNumber"
-              :max-pages="5"
-              size="sm"
-              boundary-links
-              direction-links
-            ></q-pagination>
-          </template>
-        </q-table>
-      </div>
-
-      <!-- <q-card-actions align="right">
-        <q-btn flat label="OK" color="primary" v-close-popup />
-      </q-card-actions> -->
+          <div class="col-12 q-mt-sm">
+            <d-table
+              flat
+              dense
+              bordered
+              :rows="rows"
+              :columns="columns"
+              row-key="order"
+              no-data-label="ไม่มีข้อมูล"
+            >
+              <template v-slot:header="props">
+                <q-tr :props="props">
+                  <q-th
+                    v-for="col in props.cols"
+                    :key="col.name"
+                    :props="props"
+                  >
+                    <div class="text-grey-7 text-weight-medium">
+                      <span class="row">{{ col.label }}</span>
+                    </div>
+                  </q-th>
+                </q-tr>
+              </template>
+              <template v-slot:body="props">
+                <q-tr :props="props" class="cursor-pointer">
+                  <q-td
+                    v-for="col in props.cols"
+                    :key="col.name"
+                    :props="props"
+                  >
+                    <div v-if="col.name === 'no'">
+                      {{ props.rowIndex + 1 }}
+                    </div>
+                    <div
+                      v-else-if="col.name === 'citizenId'"
+                      class="text-primary"
+                      @click="clickRedirect(props.row.id)"
+                    >
+                      {{ props.row.citizenId ?? "-" }}
+                    </div>
+                    <div
+                      v-else-if="col.name === 'name'"
+                      class="text-primary"
+                      @click="clickRedirect(props.row.id)"
+                    >
+                      {{ props.row.name ?? "-" }}
+                    </div>
+                    <div v-else class="table_ellipsis2">
+                      {{ col.value ? col.value : "-" }}
+                    </div>
+                  </q-td>
+                </q-tr>
+              </template>
+            </d-table>
+          </div>
+        </q-form>
+      </q-card-section>
     </q-card>
   </q-dialog>
 </template>
 
-<style scoped>
-.custom-header-table {
-  max-height: 64vh;
-
-  .q-table tr:nth-child(odd) td {
-    background: white;
-  }
-
-  .q-table tr:nth-child(even) td {
-    background: #f8f8f8;
-  }
-
-  .q-table thead tr {
-    background: #ecebeb;
-  }
-
-  .q-table thead tr th {
-    position: sticky;
-    z-index: 1;
-  }
-
-  .q-table thead tr:last-child th {
-    top: 48px;
-  }
-
-  .q-table thead tr:first-child th {
-    top: 0;
-  }
-}
-</style>
+<style scoped></style>
diff --git a/src/modules/04_registryNew/interface/response/History.ts b/src/modules/04_registryNew/interface/response/History.ts
new file mode 100644
index 000000000..75669ae59
--- /dev/null
+++ b/src/modules/04_registryNew/interface/response/History.ts
@@ -0,0 +1,23 @@
+interface HistoryPos {
+  citizenId: string;
+  date: string | Date;
+  fullName: string;
+  id: string;
+  posNo: string;
+  position: string;
+}
+
+interface Position {
+  createdAt: string;
+  createdFullName: string;
+  createdUserId: string;
+  id: string;
+  isActive: boolean;
+  lastUpdateFullName: string;
+  lastUpdateUserId: "";
+  lastUpdatedAt: string;
+  name: string;
+  note: string;
+}
+
+export type { HistoryPos, Position };

From bb6afbb98ef0c8babbf793597b4c607d98b733f7 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Tue, 9 Jul 2024 10:39:49 +0700
Subject: [PATCH 05/10] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=82?=
 =?UTF-8?q?=E0=B8=84=E0=B9=89=E0=B8=94=E0=B8=95=E0=B8=B2=E0=B8=A1=20issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts                              |  20 +--
 .../components/salaryNew/Salary.vue           | 168 +++++++++---------
 .../components/probation/FormAssign.vue       |  45 +++--
 .../components/EditEmployee/Salary.vue        | 128 +++++++------
 .../10_order/components/step/step01.vue       |   2 +
 .../Tab/Dialog/01_FormIndicator.vue           |   2 +
 .../components/Tab/Topic/02_Competency.vue    |   2 +-
 .../components/FollowResult.vue               |  33 ++--
 .../15_development/components/MainTab.vue     |   2 +-
 .../15_development/components/Other.vue       |   3 +-
 .../components/ProjectDetail.vue              |  77 +++++++-
 .../15_development/components/Target.vue      |  93 +++++-----
 12 files changed, 323 insertions(+), 252 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index b29b5fb3d..c83ba8b29 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -11,31 +11,31 @@ export const apiUrlConfigReport = import.meta.env.VITE_API_REPORT_URL;
 const config = ref<any>({
   development: {
     // API_URI: "http://localhost:13001/api/v1",
-    API_URI: "https://bma-ehr.frappet.synology.me/api/v1",
+    API_URI: "https://bma-ehr.frappet.com/api/v1",
     // API_URI_ORG_SERVICE: "https://localhost:7056/api/v1", //ใช้ชั่วคราว
-    API_URI_ORG_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว
+    API_URI_ORG_SERVICE: "https://bma-ehr.frappet.com/api/v1", //ใช้ชั่วคราว
     // API_URI_ORG_EMPLOYEE_SERVICE: "https://localhost:7208/api/v1", //ใช้ชั่วคราว
-    API_URI_ORG_EMPLOYEE_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว
+    API_URI_ORG_EMPLOYEE_SERVICE: "https://bma-ehr.frappet.com/api/v1", //ใช้ชั่วคราว
     // API_URI_PROFILE_SERVICE: "https://localhost:7159/api/v1",
-    API_URI_PROFILE_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว
+    API_URI_PROFILE_SERVICE: "https://bma-ehr.frappet.com/api/v1", //ใช้ชั่วคราว
     // API_CANDIDATE_URI: "https://localhost:7007/api/v1",
-    API_CANDIDATE_URI: "https://bma-ehr.frappet.synology.me/api/v1",
+    API_CANDIDATE_URI: "https://bma-ehr.frappet.com/api/v1",
     // API_REPORT_URI: "https://localhost:7187/api/v1",
-    API_REPORT_URI: "https://bma-ehr.frappet.synology.me/api/v1",
+    API_REPORT_URI: "https://bma-ehr.frappet.com/api/v1",
     // API_PLACEMENT_URI: "https://localhost:7260/api",
-    API_PLACEMENT_URI: "https://bma-ehr.frappet.synology.me/api/v1",
+    API_PLACEMENT_URI: "https://bma-ehr.frappet.com/api/v1",
     API_URI_ORG_TREE:
       "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/tree_20230712_172702.json",
     MEET_URI: "meet.frappet.com",
-    API_RETIREMENT_URI: "https://bma-ehr.frappet.synology.me/api/v1",
+    API_RETIREMENT_URI: "https://bma-ehr.frappet.com/api/v1",
     // API_PROBATION_URI: "https://ehr.joolsoft.com/v1",
-    API_PROBATION_URI: "https://bma-ehr.frappet.synology.me/api/v1/probation",
+    API_PROBATION_URI: "https://bma-ehr.frappet.com/api/v1/probation",
     // API_PROBATION_URI: "http://192.168.1.151:7776/v1",
     API_REPORT2_URI: "https://bma-ehr.frappet.synology.me/api/v2",
     LINK_EVALUATE_PUBLISH: "https://bma-ehr-publish.frappet.synology.me",
     API_REPORT_TEMPLATE_URI:
       "https://report-server.frappet.synology.me/api/v1/report-template",
-    API_SUPPORT_URI: "https://bma-ehr.frappet.synology.me/api/v1/support",
+    API_SUPPORT_URI: "https://bma-ehr.frappet.com/api/v1/support",
   },
   test: {
     API_URI: "http://localhost:5010/api/v1",
diff --git a/src/modules/04_registry/components/salaryNew/Salary.vue b/src/modules/04_registry/components/salaryNew/Salary.vue
index 608fbddef..7006e7f5b 100644
--- a/src/modules/04_registry/components/salaryNew/Salary.vue
+++ b/src/modules/04_registry/components/salaryNew/Salary.vue
@@ -1706,52 +1706,50 @@ const fetchData = async () => {
       .then((res) => {
         let data = res.data.result;
         rows.value = [];
-        data.map((e: any) => {
-          rows.value.push({
-            id: e.id,
-            date: new Date(e.date),
-            amount: e.amount,
-            positionSalaryAmount: e.positionSalaryAmount,
-            mouthSalaryAmount: e.mouthSalaryAmount,
-            oc: e.oc,
-            ocId: e.ocId,
-            position: e.position,
-            positionName: e.positionName,
-            positionId:
-              e.positionId !== "00000000-0000-0000-0000-000000000000"
-                ? e.positionId
-                : "",
-            posNo: e.posNo,
-            posNoId:
-              e.posNoId !== "00000000-0000-0000-0000-000000000000"
-                ? e.posNoId
-                : "",
-            positionLine: e.positionLine,
-            positionLineName: e.positionLineName,
-            positionLineId: e.positionLineId,
-            positionPathSide: e.positionPathSide,
-            positionPathSideId: e.positionPathSideId,
-            positionPathSideName: e.positionPathSideName,
-            positionType: e.positionType,
-            positionTypeId: e.positionTypeId,
-            positionLevelId: e.positionLevelId,
-            positionLevel: e.positionLevel,
-            positionExecutive: e.positionExecutive,
-            positionExecutiveId: e.positionExecutiveId,
-            positionExecutiveName: e.positionExecutiveName,
-            positionExecutiveSide: e.positionExecutiveSide,
-            positionExecutiveSideId: e.positionExecutiveSideId,
-            salaryClass: e.salaryClass,
-            salaryRef: e.salaryRef,
-            salaryStatus: e.salaryStatus,
-            refCommandNo: e.refCommandNo,
-            createdFullName: e.createdFullName,
-            orgName: e.orgName,
-            agencyName: e.agencyName,
-            cLevel: e.cLevel,
-            createdAt: new Date(e.createdAt),
-          });
-        });
+        rows.value = data.map((e: any) => ({
+          id: e.id,
+          date: new Date(e.date),
+          amount: e.amount,
+          positionSalaryAmount: e.positionSalaryAmount,
+          mouthSalaryAmount: e.mouthSalaryAmount,
+          oc: e.oc,
+          ocId: e.ocId,
+          position: e.position,
+          positionName: e.positionName,
+          positionId:
+            e.positionId !== "00000000-0000-0000-0000-000000000000"
+              ? e.positionId
+              : "",
+          posNo: e.posNo,
+          posNoId:
+            e.posNoId !== "00000000-0000-0000-0000-000000000000"
+              ? e.posNoId
+              : "",
+          positionLine: e.positionLine,
+          positionLineName: e.positionLineName,
+          positionLineId: e.positionLineId,
+          positionPathSide: e.positionPathSide,
+          positionPathSideId: e.positionPathSideId,
+          positionPathSideName: e.positionPathSideName,
+          positionType: e.positionType,
+          positionTypeId: e.positionTypeId,
+          positionLevelId: e.positionLevelId,
+          positionLevel: e.positionLevel,
+          positionExecutive: e.positionExecutive,
+          positionExecutiveId: e.positionExecutiveId,
+          positionExecutiveName: e.positionExecutiveName,
+          positionExecutiveSide: e.positionExecutiveSide,
+          positionExecutiveSideId: e.positionExecutiveSideId,
+          salaryClass: e.salaryClass,
+          salaryRef: e.salaryRef,
+          salaryStatus: e.salaryStatus,
+          refCommandNo: e.refCommandNo,
+          createdFullName: e.createdFullName,
+          orgName: e.orgName,
+          agencyName: e.agencyName,
+          cLevel: e.cLevel,
+          createdAt: new Date(e.createdAt),
+        }));
       })
       .catch((e) => {
         messageError($q, e);
@@ -2257,46 +2255,44 @@ const clickHistory = async (row: RequestItemsObject) => {
     .then((res) => {
       let data = res.data.result;
       rowsHistory.value = [];
-      data.map((e: any) => {
-        rowsHistory.value.push({
-          id: e.id,
-          date: new Date(e.date),
-          amount: e.amount,
-          positionSalaryAmount: e.positionSalaryAmount,
-          mouthSalaryAmount: e.mouthSalaryAmount,
-          oc: e.oc,
-          ocId: e.ocId,
-          position: e.position,
-          positionId: e.positionId,
-          positionName: e.positionName,
-          posNo: e.posNo,
-          posNoId: e.posNoId,
-          positionLine: e.positionLine,
-          positionLineName: e.positionLineName,
-          positionLineId: e.positionLineId,
-          positionPathSide: e.positionPathSide,
-          positionPathSideId: e.positionPathSideId,
-          positionPathSideName: e.positionPathSideName,
-          positionType: e.positionType,
-          positionTypeId: e.positionTypeId,
-          positionLevel: e.positionLevel,
-          positionLevelId: e.positionLevelId,
-          positionExecutive: e.positionExecutive,
-          positionExecutiveId: e.positionExecutiveId,
-          positionExecutiveName: e.positionExecutiveName,
-          positionExecutiveSide: e.positionExecutiveSide,
-          positionExecutiveSideId: e.positionExecutiveSideId,
-          salaryClass: e.salaryClass,
-          salaryStatus: e.salaryStatus,
-          salaryRef: e.salaryRef,
-          refCommandNo: e.refCommandNo,
-          createdFullName: e.createdFullName,
-          orgName: e.orgName,
-          agencyName: e.agencyName,
-          cLevel: e.cLevel,
-          createdAt: new Date(e.createdAt),
-        });
-      });
+      rowsHistory.value = data.map((e: any) => ({
+        id: e.id,
+        date: new Date(e.date),
+        amount: e.amount,
+        positionSalaryAmount: e.positionSalaryAmount,
+        mouthSalaryAmount: e.mouthSalaryAmount,
+        oc: e.oc,
+        ocId: e.ocId,
+        position: e.position,
+        positionId: e.positionId,
+        positionName: e.positionName,
+        posNo: e.posNo,
+        posNoId: e.posNoId,
+        positionLine: e.positionLine,
+        positionLineName: e.positionLineName,
+        positionLineId: e.positionLineId,
+        positionPathSide: e.positionPathSide,
+        positionPathSideId: e.positionPathSideId,
+        positionPathSideName: e.positionPathSideName,
+        positionType: e.positionType,
+        positionTypeId: e.positionTypeId,
+        positionLevel: e.positionLevel,
+        positionLevelId: e.positionLevelId,
+        positionExecutive: e.positionExecutive,
+        positionExecutiveId: e.positionExecutiveId,
+        positionExecutiveName: e.positionExecutiveName,
+        positionExecutiveSide: e.positionExecutiveSide,
+        positionExecutiveSideId: e.positionExecutiveSideId,
+        salaryClass: e.salaryClass,
+        salaryStatus: e.salaryStatus,
+        salaryRef: e.salaryRef,
+        refCommandNo: e.refCommandNo,
+        createdFullName: e.createdFullName,
+        orgName: e.orgName,
+        agencyName: e.agencyName,
+        cLevel: e.cLevel,
+        createdAt: new Date(e.createdAt),
+      }));
     })
     .catch((e) => {
       messageError($q, e);
diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue
index adc2cba5d..c3d6187b8 100644
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@@ -299,6 +299,8 @@ function deleteProductivitys(item: number) {
   }
 }
 
+
+
 /** get ข้อมูล */
 async function getUser() {
   await http
@@ -980,17 +982,18 @@ watch(knowledge.value, () => {
  * @param update fn
  */
 function filterFnCaretaker(val: string, update: any) {
+  const dataFilter = filtermantor(OPcaretaker.value, [caretaker2.value]).filter(
+    (i: any) => i.id !== chairman.value.id
+  );
   if (val == "") {
     update(() => {
-      optionCaretaker.value = filtermantor(OPcaretaker.value, [
-        caretaker2.value,
-      ]);
+      optionCaretaker.value = dataFilter;
     });
   } else {
     update(() => {
-      optionCaretaker.value = filtermantor(OPcaretaker.value, [
-        caretaker2.value,
-      ]).filter((e: any) => e.name.search(val) !== -1);
+      optionCaretaker.value = dataFilter.filter(
+        (e: any) => e.name.search(val) !== -1
+      );
     });
   }
 }
@@ -1002,17 +1005,18 @@ function filterFnCaretaker(val: string, update: any) {
  */
 
 function filterFnCaretaker2(val: string, update: any) {
+  const dataFilter = filtermantor(OPcaretaker.value, [caretaker1.value]).filter(
+    (i: any) => i.id !== chairman.value.id
+  );
   if (val == "") {
     update(() => {
-      optionCaretaker2.value = filtermantor(OPcaretaker.value, [
-        caretaker1.value,
-      ]);
+      optionCaretaker2.value = dataFilter;
     });
   } else {
     update(() => {
-      optionCaretaker2.value = filtermantor(OPcaretaker.value, [
-        caretaker1.value,
-      ]).filter((e: any) => e.name.search(val) !== -1);
+      optionCaretaker2.value = dataFilter.filter(
+        (e: any) => e.name.search(val) !== -1
+      );
     });
   }
 }
@@ -1024,13 +1028,16 @@ function filterFnCaretaker2(val: string, update: any) {
  */
 
 function filterFnCommander(val: string, update: any) {
+  const dataFilter = OPcommander.value.filter(
+    (i: any) => i.id !== chairman.value.id
+  );
   if (val == "") {
     update(() => {
-      OPcommanderFn.value = OPcommander.value;
+      OPcommanderFn.value = dataFilter;
     });
   } else {
     update(() => {
-      OPcommanderFn.value = OPcommander.value.filter(
+      OPcommanderFn.value = dataFilter.filter(
         (e: any) => e.name.search(val) !== -1
       );
     });
@@ -1044,13 +1051,19 @@ function filterFnCommander(val: string, update: any) {
  */
 
 function filterFnChairman(val: string, update: any) {
+  const dataFilter = OPchairman.value.filter(
+    (i: any) =>
+      i.id !== caretaker1.value.id &&
+      i.id !== caretaker2.value.id &&
+      i.id !== commander.value.id
+  );
   if (val == "") {
     update(() => {
-      OPchairmanFn.value = OPchairman.value;
+      OPchairmanFn.value = dataFilter;
     });
   } else {
     update(() => {
-      OPchairmanFn.value = OPchairman.value.filter(
+      OPchairmanFn.value = dataFilter.filter(
         (e: any) => e.name.search(val) !== -1
       );
     });
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Salary.vue b/src/modules/08_registryEmployee/components/EditEmployee/Salary.vue
index 07deb7ae4..e04767679 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Salary.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Salary.vue
@@ -972,39 +972,37 @@ const fetchData = async () => {
       .then((res) => {
         let data = res.data.result;
         rows.value = [];
-        data.map((e: ResponseObject) => {
-          rows.value.push({
-            id: e.id,
-            date: new Date(e.date),
-            amount: e.amount,
-            positionSalaryAmount: e.positionSalaryAmount,
-            mouthSalaryAmount: e.mouthSalaryAmount,
-            oc: e.oc,
-            ocId: e.ocId,
-            position: e.position,
-            positionId: e.positionId,
-            posNo: e.posNo,
-            posNoId: e.posNoId,
-            positionLine: e.positionLine,
-            positionLineId: e.positionLineId,
-            positionPathSide: e.positionPathSide,
-            positionPathSideId: e.positionPathSideId,
-            positionType: e.positionType,
-            positionTypeId: e.positionTypeId,
-            positionLevel: e.positionLevel,
-            positionLevelId: e.positionLevelId,
-            positionExecutive: e.positionExecutive,
-            positionExecutiveId: e.positionExecutiveId,
-            positionExecutiveSide: e.positionExecutiveSide,
-            positionExecutiveSideId: e.positionExecutiveSideId,
-            salaryClass: e.salaryClass,
-            salaryRef: e.salaryRef,
-            salaryStatus: e.salaryStatus,
-            refCommandNo: e.refCommandNo,
-            createdFullName: e.createdFullName,
-            createdAt: new Date(e.createdAt),
-          });
-        });
+        rows.value = data.map((e: ResponseObject) => ({
+          id: e.id,
+          date: new Date(e.date),
+          amount: e.amount,
+          positionSalaryAmount: e.positionSalaryAmount,
+          mouthSalaryAmount: e.mouthSalaryAmount,
+          oc: e.oc,
+          ocId: e.ocId,
+          position: e.position,
+          positionId: e.positionId,
+          posNo: e.posNo,
+          posNoId: e.posNoId,
+          positionLine: e.positionLine,
+          positionLineId: e.positionLineId,
+          positionPathSide: e.positionPathSide,
+          positionPathSideId: e.positionPathSideId,
+          positionType: e.positionType,
+          positionTypeId: e.positionTypeId,
+          positionLevel: e.positionLevel,
+          positionLevelId: e.positionLevelId,
+          positionExecutive: e.positionExecutive,
+          positionExecutiveId: e.positionExecutiveId,
+          positionExecutiveSide: e.positionExecutiveSide,
+          positionExecutiveSideId: e.positionExecutiveSideId,
+          salaryClass: e.salaryClass,
+          salaryRef: e.salaryRef,
+          salaryStatus: e.salaryStatus,
+          refCommandNo: e.refCommandNo,
+          createdFullName: e.createdFullName,
+          createdAt: new Date(e.createdAt),
+        }));
       })
       .catch((e) => {
         messageError($q, e);
@@ -1450,39 +1448,37 @@ const clickHistory = async (row: RequestItemsObject) => {
     .then((res) => {
       let data = res.data.result;
       rowsHistory.value = [];
-      data.map((e: ResponseObject) => {
-        rowsHistory.value.push({
-          id: e.id,
-          date: new Date(e.date),
-          amount: e.amount,
-          positionSalaryAmount: e.positionSalaryAmount,
-          mouthSalaryAmount: e.mouthSalaryAmount,
-          oc: e.oc,
-          ocId: e.ocId,
-          position: e.position,
-          positionId: e.positionId,
-          posNo: e.posNo,
-          posNoId: e.posNoId,
-          positionLine: e.positionLine,
-          positionLineId: e.positionLineId,
-          positionPathSide: e.positionPathSide,
-          positionPathSideId: e.positionPathSideId,
-          positionType: e.positionType,
-          positionTypeId: e.positionTypeId,
-          positionLevel: e.positionLevel,
-          positionLevelId: e.positionLevelId,
-          positionExecutive: e.positionExecutive,
-          positionExecutiveId: e.positionExecutiveId,
-          positionExecutiveSide: e.positionExecutiveSide,
-          positionExecutiveSideId: e.positionExecutiveSideId,
-          salaryClass: e.salaryClass,
-          salaryRef: e.salaryRef,
-          refCommandNo: e.refCommandNo,
-          salaryStatus: e.salaryStatus,
-          createdFullName: e.createdFullName,
-          createdAt: new Date(e.createdAt),
-        });
-      });
+      rowsHistory.value = data.map((e: ResponseObject) => ({
+        id: e.id,
+        date: new Date(e.date),
+        amount: e.amount,
+        positionSalaryAmount: e.positionSalaryAmount,
+        mouthSalaryAmount: e.mouthSalaryAmount,
+        oc: e.oc,
+        ocId: e.ocId,
+        position: e.position,
+        positionId: e.positionId,
+        posNo: e.posNo,
+        posNoId: e.posNoId,
+        positionLine: e.positionLine,
+        positionLineId: e.positionLineId,
+        positionPathSide: e.positionPathSide,
+        positionPathSideId: e.positionPathSideId,
+        positionType: e.positionType,
+        positionTypeId: e.positionTypeId,
+        positionLevel: e.positionLevel,
+        positionLevelId: e.positionLevelId,
+        positionExecutive: e.positionExecutive,
+        positionExecutiveId: e.positionExecutiveId,
+        positionExecutiveSide: e.positionExecutiveSide,
+        positionExecutiveSideId: e.positionExecutiveSideId,
+        salaryClass: e.salaryClass,
+        salaryRef: e.salaryRef,
+        refCommandNo: e.refCommandNo,
+        salaryStatus: e.salaryStatus,
+        createdFullName: e.createdFullName,
+        createdAt: new Date(e.createdAt),
+      }));
     })
     .catch((e) => {
       messageError($q, e);
diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue
index f06b8cbe3..e06d50818 100644
--- a/src/modules/10_order/components/step/step01.vue
+++ b/src/modules/10_order/components/step/step01.vue
@@ -899,6 +899,7 @@ const getClass = (val: boolean) => {
                     :rules="[(val) => !!val || `${'กรุณากรอก พ.ศ.'}`]"
                     :label="`${'พ.ศ.'}`"
                     dense
+                    hide-bottom-space
                     outlined
                   >
                   </q-input>
@@ -927,6 +928,7 @@ const getClass = (val: boolean) => {
                   :class="getClass(true)"
                   outlined
                   dense
+                  hide-bottom-space
                   class="full-width datepicker"
                   :model-value="
                     dateCommand != null ? date2Thai(dateCommand) : null
diff --git a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
index 7086a9a29..d543fdbe7 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/01_FormIndicator.vue
@@ -863,6 +863,7 @@ const title = computed(() => {
                     autoApply
                     :enableTimePicker="false"
                     week-start="0"
+                    @update:model-value="formDetail.endDate = null"
                   >
                     <template #year="{ year }">{{ year + 543 }}</template>
                     <template #year-overlay-value="{ value }">{{
@@ -906,6 +907,7 @@ const title = computed(() => {
                     autoApply
                     :enableTimePicker="false"
                     week-start="0"
+                    :min-date="formDetail.startDate"
                   >
                     <template #year="{ year }">{{ year + 543 }}</template>
                     <template #year-overlay-value="{ value }">{{
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 6e1e753d8..74eb72315 100644
--- a/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
+++ b/src/modules/14_KPI/components/Tab/Topic/02_Competency.vue
@@ -349,7 +349,7 @@ onMounted(() => {
         <d-table
           ref="table"
           :columns="columns"
-          :rows="rows.length !== 0 ? rows[item.id]:[]"
+          :rows="rows[item.id].length !== 0 ? rows[item.id]:[]"
           row-key="id"
           flat
           bordered
diff --git a/src/modules/15_development/components/FollowResult.vue b/src/modules/15_development/components/FollowResult.vue
index 086315f86..1ab206d7b 100644
--- a/src/modules/15_development/components/FollowResult.vue
+++ b/src/modules/15_development/components/FollowResult.vue
@@ -441,6 +441,21 @@ onMounted(() => {
         <q-separator />
         <q-card-section >
           <div class="row q-col-gutter-sm">
+            <div class="col-12">
+              <q-input
+                dense
+                outlined
+                class="inputgreen"
+                label="ชื่อตัวชี้วัด"
+                v-model="formIndicators.indicators"
+                hide-bottom-space
+                :rules="[
+                  (val:string) =>
+                    !!val || `${'กรุณากรอกชื่อตัวชี้วัด'}`,
+      
+                ]"
+              />
+            </div>
             <div class="col-6">
               <q-select
                 dense
@@ -461,23 +476,9 @@ onMounted(() => {
                 ]"
               />
             </div>
-            <div class="col-4">
-              <q-input
-                dense
-                outlined
-                class="inputgreen"
-                label="ชื่อตัวชี้วัด"
-                v-model="formIndicators.indicators"
-                hide-bottom-space
-                :rules="[
-                  (val:string) =>
-                    !!val || `${'กรุณากรอกชื่อตัวชี้วัด'}`,
-      
-                ]"
-              />
-            </div>
 
-            <div class="col-2">
+
+            <div class="col-6">
               <q-input
                 dense
                 outlined
diff --git a/src/modules/15_development/components/MainTab.vue b/src/modules/15_development/components/MainTab.vue
index a4c229443..73076693c 100644
--- a/src/modules/15_development/components/MainTab.vue
+++ b/src/modules/15_development/components/MainTab.vue
@@ -133,7 +133,7 @@ onMounted(() => {
         <q-tab-panel name="Target"> <Target /></q-tab-panel>
         <q-tab-panel name="ProjectDetail" style="padding: 0px"> <ProjectDetail /> </q-tab-panel>
         <q-tab-panel name="FollowResult"> <FollowResult /> </q-tab-panel>
-        <q-tab-panel name="Other" style="padding: 0px"> <Other /> </q-tab-panel>
+        <q-tab-panel name="Other" style="padding: 0px"> <Other :status="status"/> </q-tab-panel>
         <q-tab-panel name="Record"> <Record /> </q-tab-panel>
       </q-tab-panels>
     </div>
diff --git a/src/modules/15_development/components/Other.vue b/src/modules/15_development/components/Other.vue
index 92bc32744..6ae9ff120 100644
--- a/src/modules/15_development/components/Other.vue
+++ b/src/modules/15_development/components/Other.vue
@@ -23,6 +23,7 @@ const {
 const route = useRoute();
 const projectId = ref<string>(route.params.id.toLocaleString());
 
+const status = defineModel<string>('status',{required:true})
 const provinceOp = ref<DataOption[]>([]);
 const provinceOpMain = ref<DataOption[]>([]);
 const budgetOp = ref<DataOption[]>([
@@ -475,7 +476,7 @@ onMounted(() => {
               reverse-fill-mask
             />
           </div>
-          <div class="col-3">
+          <div class="col-3" v-if="status == 'FINISH'">
             <q-input
               outlined
               dense
diff --git a/src/modules/15_development/components/ProjectDetail.vue b/src/modules/15_development/components/ProjectDetail.vue
index 837b8ceca..49605bbbc 100644
--- a/src/modules/15_development/components/ProjectDetail.vue
+++ b/src/modules/15_development/components/ProjectDetail.vue
@@ -15,6 +15,11 @@ import { useDevelopmentDataStore } from "@/modules/15_development/store/developm
 import http from "@/plugins/http";
 import config from "@/app.config";
 
+const other1 = ref<boolean>(false);
+const other2 = ref<boolean>(false);
+const otherInput1 = ref<string>("");
+const otherInput2 = ref<string>("");
+
 const $q = useQuasar();
 const store = useDevelopmentDataStore();
 const route = useRoute();
@@ -161,7 +166,9 @@ async function onSubmit() {
         projectModal: formData.projectModal,
         isBackPlanned: formData.isBackPlanned,
         isHoldPlanned: formData.isHoldPlanned,
-        projectDayBackPlanned: formData.isBackPlanned ? formData.projectDayBackPlanned:null,
+        projectDayBackPlanned: formData.isBackPlanned
+          ? formData.projectDayBackPlanned
+          : null,
         projectDayHoldPlanned: formData.projectDayHoldPlanned,
         projectNigthHoldPlanned: formData.projectNigthHoldPlanned,
         developmentProjectTechniquePlanneds:
@@ -206,6 +213,15 @@ function updateSelected(data: DataStrategic, type: string) {
   }
 }
 
+function checkOther(type: number, val: boolean) {
+  if(val == false){
+    if(type == 1){
+      otherInput1.value = ''
+    }else if(type == 2){
+      otherInput2.value = ''
+    }
+  }
+}
 /** ดึงข้อมูลเมื่อคอมโพเนนต์โหลดเสร็จสมบูรณ์  */
 onMounted(() => {
   fetchData();
@@ -232,7 +248,6 @@ onMounted(() => {
         />
       </div>
 
-
       <q-card bordered class="col-12 q-my-sm">
         <div
           class="col-xs-12 col-sm-12 text-weight-medium bg-grey-3 q-py-xs q-px-md"
@@ -285,7 +300,9 @@ onMounted(() => {
                       <q-item
                         clickable
                         @click.stop="updateSelected(prop.node, '1')"
-                      :active="formData.strategyChildPlannedId == prop.node.id"
+                        :active="
+                          formData.strategyChildPlannedId == prop.node.id
+                        "
                         active-class="my-list-link text-primary text-weight-medium"
                         class="row col-12 items-center text-dark q-py-xs q-pl-sm rounded-borders my-list"
                       >
@@ -448,7 +465,29 @@ onMounted(() => {
                   type="checkbox"
                 />
               </div>
+              <div class="col-12 q-mb-lg">
+                <div class="row">
+                  <div class="col-4 relative-position">
+                    <div class="other_custom">
+                      <q-checkbox
+                        v-model="other1"
+                        label="อื่นๆ"
+                        size="sm"
+                        color="primary"
+                        keep-color
+                        :disable="store.projectStatus === 'FINISH'"
+                        @update:model-value="checkOther(1, other1)"
+                      />
+                    </div>
+                  </div>
 
+                  <div class="col-8 relative-position">
+                    <div class="other_custom_input" v-if="other1 == true">
+                      <q-input v-model="otherInput1" dense outlined label="กรุณากรอก อื่นๆ"></q-input>
+                    </div>
+                  </div>
+                </div>
+              </div>
               <div class="col-12 col-sm-6 col-md-4">
                 <q-input
                   :disable="store.projectStatus === 'FINISH'"
@@ -534,6 +573,28 @@ onMounted(() => {
                   type="checkbox"
                 />
               </div>
+              <div class="col-12 q-mb-lg">
+                <div class="row">
+                  <div class="col-4 relative-position">
+                    <div class="other_custom">
+                      <q-checkbox
+                        v-model="other2"
+                        label="อื่นๆ"
+                        size="sm"
+                        color="primary"
+                        keep-color
+                        @update:model-value="checkOther(2, other2)"
+                      />
+                    </div>
+                  </div>
+
+                  <div class="col-8 relative-position">
+                    <div class="other_custom_input" v-if="other2 == true">
+                      <q-input v-model="otherInput2" dense outlined label="กรุณากรอก อื่นๆ"></q-input>
+                    </div>
+                  </div>
+                </div>
+              </div>
               <div class="col-12 col-sm-6 col-md-4">
                 <q-input
                   dense
@@ -573,4 +634,14 @@ onMounted(() => {
   font-weight: 600;
   border: 1px solid rgba(175, 185, 196, 0.217);
 }
+.other_custom {
+  position: absolute;
+  left: -7px;
+  top: -29px;
+}
+.other_custom_input {
+  position: absolute;
+  top: -25px;
+  width: 100%;
+}
 </style>
diff --git a/src/modules/15_development/components/Target.vue b/src/modules/15_development/components/Target.vue
index 60bf2b1d5..a7f3a1798 100644
--- a/src/modules/15_development/components/Target.vue
+++ b/src/modules/15_development/components/Target.vue
@@ -1104,6 +1104,47 @@ onMounted(() => {
               v-for="(items, index) in formGroupTarget.positions"
               class="col-12 row q-col-gutter-sm"
             >
+
+              <div
+                class="col"
+                v-if="formGroupTarget.groupTarget !== 'OUTSIDERS'"
+              >
+                <q-select
+                  dense
+                  outlined
+                  class="inputgreen"
+                  v-model="items.posTypeId"
+                  :options="posTypeOp"
+                  option-label="name"
+                  option-value="id"
+                  emit-value
+                  map-options
+                  input-class="text-red"
+                  label="ประเภทตำแหน่ง"
+                  @update:model-value="updatePosTypeName"
+                />
+              </div>
+              <div
+                class="col"
+                v-if="formGroupTarget.groupTarget !== 'OUTSIDERS'"
+              >
+                <q-select
+                  dense
+                  outlined
+                  class="inputgreen"
+                  v-model="items.posLevelId"
+                  :options="
+                    posTypeMain.find((v) => items.posTypeId === v.id)
+                      ?.posLevels || []
+                  "
+                  option-label="posLevelName"
+                  option-value="id"
+                  emit-value
+                  map-options
+                  input-class="text-red"
+                  label="ระดับตำแหน่ง"
+                />
+              </div>
               <div
                 class="col"
                 v-if="formGroupTarget.groupTarget !== 'OUTSIDERS'"
@@ -1121,58 +1162,6 @@ onMounted(() => {
               ]"
                 />
               </div>
-              <div
-                class="col"
-                v-if="formGroupTarget.groupTarget !== 'OUTSIDERS'"
-              >
-                <q-select
-                  dense
-                  outlined
-                  hide-bottom-space
-                  lazy-rules
-                  class="inputgreen"
-                  v-model="items.posTypeId"
-                  :options="posTypeOp"
-                  option-label="name"
-                  option-value="id"
-                  emit-value
-                  map-options
-                  input-class="text-red"
-                  label="ประเภทตำแหน่ง"
-                  @update:model-value="updatePosTypeName"
-                  :rules="[
-                    (val:string) =>
-                    !!val || `${'กรุณาเลือกประเภทตำแหน่ง'}`,
-                     ]"
-                />
-              </div>
-              <div
-                class="col"
-                v-if="formGroupTarget.groupTarget !== 'OUTSIDERS'"
-              >
-                <q-select
-                  dense
-                  outlined
-                  hide-bottom-space
-                  lazy-rules
-                  class="inputgreen"
-                  v-model="items.posLevelId"
-                  :options="
-                    posTypeMain.find((v) => items.posTypeId === v.id)
-                      ?.posLevels || []
-                  "
-                  option-label="posLevelName"
-                  option-value="id"
-                  emit-value
-                  map-options
-                  input-class="text-red"
-                  label="ระดับตำแหน่ง"
-                  :rules="[
-        (val:string) =>
-          !!val || `${'กรุณาเลือกระดับ'}`,
-      ]"
-                />
-              </div>
               <div
                 class="col-1 q-mt-sm"
                 v-if="formGroupTarget.groupTarget !== 'OUTSIDERS'"

From f5c935b5df70bc46ded4426e987e1d36580a9bbd Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Tue, 9 Jul 2024 10:41:08 +0700
Subject: [PATCH 06/10] no message

---
 src/api/index.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index c83ba8b29..b29b5fb3d 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -11,31 +11,31 @@ export const apiUrlConfigReport = import.meta.env.VITE_API_REPORT_URL;
 const config = ref<any>({
   development: {
     // API_URI: "http://localhost:13001/api/v1",
-    API_URI: "https://bma-ehr.frappet.com/api/v1",
+    API_URI: "https://bma-ehr.frappet.synology.me/api/v1",
     // API_URI_ORG_SERVICE: "https://localhost:7056/api/v1", //ใช้ชั่วคราว
-    API_URI_ORG_SERVICE: "https://bma-ehr.frappet.com/api/v1", //ใช้ชั่วคราว
+    API_URI_ORG_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว
     // API_URI_ORG_EMPLOYEE_SERVICE: "https://localhost:7208/api/v1", //ใช้ชั่วคราว
-    API_URI_ORG_EMPLOYEE_SERVICE: "https://bma-ehr.frappet.com/api/v1", //ใช้ชั่วคราว
+    API_URI_ORG_EMPLOYEE_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว
     // API_URI_PROFILE_SERVICE: "https://localhost:7159/api/v1",
-    API_URI_PROFILE_SERVICE: "https://bma-ehr.frappet.com/api/v1", //ใช้ชั่วคราว
+    API_URI_PROFILE_SERVICE: "https://bma-ehr.frappet.synology.me/api/v1", //ใช้ชั่วคราว
     // API_CANDIDATE_URI: "https://localhost:7007/api/v1",
-    API_CANDIDATE_URI: "https://bma-ehr.frappet.com/api/v1",
+    API_CANDIDATE_URI: "https://bma-ehr.frappet.synology.me/api/v1",
     // API_REPORT_URI: "https://localhost:7187/api/v1",
-    API_REPORT_URI: "https://bma-ehr.frappet.com/api/v1",
+    API_REPORT_URI: "https://bma-ehr.frappet.synology.me/api/v1",
     // API_PLACEMENT_URI: "https://localhost:7260/api",
-    API_PLACEMENT_URI: "https://bma-ehr.frappet.com/api/v1",
+    API_PLACEMENT_URI: "https://bma-ehr.frappet.synology.me/api/v1",
     API_URI_ORG_TREE:
       "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/tree_20230712_172702.json",
     MEET_URI: "meet.frappet.com",
-    API_RETIREMENT_URI: "https://bma-ehr.frappet.com/api/v1",
+    API_RETIREMENT_URI: "https://bma-ehr.frappet.synology.me/api/v1",
     // API_PROBATION_URI: "https://ehr.joolsoft.com/v1",
-    API_PROBATION_URI: "https://bma-ehr.frappet.com/api/v1/probation",
+    API_PROBATION_URI: "https://bma-ehr.frappet.synology.me/api/v1/probation",
     // API_PROBATION_URI: "http://192.168.1.151:7776/v1",
     API_REPORT2_URI: "https://bma-ehr.frappet.synology.me/api/v2",
     LINK_EVALUATE_PUBLISH: "https://bma-ehr-publish.frappet.synology.me",
     API_REPORT_TEMPLATE_URI:
       "https://report-server.frappet.synology.me/api/v1/report-template",
-    API_SUPPORT_URI: "https://bma-ehr.frappet.com/api/v1/support",
+    API_SUPPORT_URI: "https://bma-ehr.frappet.synology.me/api/v1/support",
   },
   test: {
     API_URI: "http://localhost:5010/api/v1",

From 432d2243d1dd90ee6ff6a1100ba247f0a8e8526e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 9 Jul 2024 11:02:48 +0700
Subject: [PATCH 07/10] =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=AD=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=A3=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=87=20=3D>=20=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=AD=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=A3=E0=B8=B2=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogHistoryPos.vue           | 106 ++++++++++++++----
 1 file changed, 85 insertions(+), 21 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogHistoryPos.vue b/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
index f99463770..9d930848f 100644
--- a/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
+++ b/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
@@ -1,21 +1,44 @@
 <script setup lang="ts">
-import { ref, computed, watch } from "vue";
+import { ref, watch } from "vue";
 import { useQuasar } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
+/**
+ * import Type
+ */
 import type { QTableProps } from "quasar";
 import type { HistoryPos } from "@/modules/02_organizationalNew/interface/response/organizational";
 
+/**
+ * import Components
+ */
 import Header from "@/components/DialogHeader.vue";
 
+/**
+ * import Store
+ */
 import { useCounterMixin } from "@/stores/mixin";
 import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational";
+
+/** Use*/
 const store = useOrganizational();
 const { showLoader, hideLoader, messageError, date2Thai } = useCounterMixin();
 const $q = useQuasar();
-const modal = defineModel<boolean>("modal", { required: true });
 
+/**
+ * props
+ */
+const modal = defineModel<boolean>("modal", { required: true });
+const props = defineProps({
+  rowId: {
+    type: String,
+  },
+});
+
+/**
+ * Table
+ */
 const columns = ref<QTableProps["columns"]>([
   {
     name: "no",
@@ -26,6 +49,54 @@ const columns = ref<QTableProps["columns"]>([
     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",
+  },
+  {
+    name: "position",
+    align: "left",
+    label: "ตำแแหน่ง",
+    sortable: true,
+    field: "position",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posType",
+    align: "left",
+    label: "ประเภทตำแหน่ง",
+    sortable: true,
+    field: "posType",
+    format(val, row) {
+      let name = "";
+      if (row.posType && row.position) {
+        name = `${row.posType} (${row.position})`;
+      } else if (row.posType) {
+        name = `${row.posType}`;
+      } else if (row.position) {
+        name = `(${row.position})`;
+      } else name = "-";
+      return name;
+    },
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+
+  {
+    name: "posExecutive",
+    align: "left",
+    label: "ตำแหน่งทางการบริหาร",
+    sortable: true,
+    field: "posExecutive",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "orgShortName",
     align: "left",
@@ -40,6 +111,9 @@ const columns = ref<QTableProps["columns"]>([
     align: "left",
     label: "วันที่แก้ไข",
     field: "lastUpdatedAt",
+    format(val, row) {
+      return date2Thai(val);
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -71,28 +145,15 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 ]);
-const rows = ref<any>([]);
+const rows = ref<HistoryPos[]>([]);
 
-const props = defineProps({
-  rowId: {
-    type: String,
-  },
-});
-
-async function fetchHistoryPos(id: string) {
+function fetchHistoryPos(id: string) {
   showLoader();
-  await http
+  http
     .get(config.API.orgPosHistory(id))
     .then((res) => {
       const data: HistoryPos[] = res.data.result;
-      const list = data.map((e: HistoryPos) => ({
-        ...e,
-        lastUpdatedAt: e.lastUpdatedAt ? date2Thai(e.lastUpdatedAt) : "-",
-        posMasterNoPrefix: e.posMasterNoPrefix ?? "-",
-        posMasterNo: e.posMasterNo ?? "-",
-        posMasterNoSuffix: e.posMasterNoSuffix ?? "-",
-      }));
-      rows.value = list;
+      rows.value = data;
     })
     .catch((err) => {
       messageError($q, err);
@@ -102,6 +163,9 @@ async function fetchHistoryPos(id: string) {
     });
 }
 
+/**
+ * callback function ทำงานเมื่อ   modal === true
+ */
 watch(
   () => modal.value,
   () => {
@@ -111,7 +175,7 @@ watch(
 </script>
 <template>
   <q-dialog v-model="modal">
-    <q-card style="width: 700px; max-width: 80vw">
+    <q-card style="width: 1000px; max-width: 100vw">
       <Header
         :tittle="'ประวัติตำแหน่ง'"
         :close="
@@ -153,7 +217,7 @@ watch(
                 </div>
 
                 <div v-else>
-                  {{ col.value }}
+                  {{ col.value ?? "-" }}
                 </div>
               </q-td>
             </q-tr>

From 749933a68fa2f89b97b268b2d33d4f9e59411450 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 9 Jul 2024 13:49:08 +0700
Subject: [PATCH 08/10] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A8=E0=B8=9C=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/14_KPI/api.KPI.ts                     |  6 ++
 src/interface/request/main/main.ts            |  5 +
 .../components/results/tableResults.vue       | 12 +++
 src/modules/14_KPI/router.ts                  | 12 +++
 src/modules/14_KPI/views/resultsMain.vue      | 99 +++++++++++++++++++
 5 files changed, 134 insertions(+)
 create mode 100644 src/modules/14_KPI/components/results/tableResults.vue
 create mode 100644 src/modules/14_KPI/views/resultsMain.vue

diff --git a/src/api/14_KPI/api.KPI.ts b/src/api/14_KPI/api.KPI.ts
index 04d37619e..11d64c69a 100644
--- a/src/api/14_KPI/api.KPI.ts
+++ b/src/api/14_KPI/api.KPI.ts
@@ -83,4 +83,10 @@ export default {
 
   kpiSendToGet: (id: string) => `${kpiEvaluationUser}/reason/${id}`,
   openPoint: (id: string) => `${kpiEvaluationUser}/open/${id}`,
+
+  /**
+   * ประกาศผล
+   */
+  evaluationUser: `${KpiUser}/evaluation/list`,
+  evaluationUserDone: `${KpiUser}/evaluation/done/kp7`,
 };
diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 9e0340d3a..df5d4f024 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -567,6 +567,11 @@ const menuList = readonly<any[]>([
         path: "KPI​List",
         role: "evaluateKPI",
       },
+      {
+        label: "ประกาศผล",
+        path: "KPIResults",
+        role: "evaluateKPI",
+      },
       {
         label: "รายงาน",
         path: "KPIReport",
diff --git a/src/modules/14_KPI/components/results/tableResults.vue b/src/modules/14_KPI/components/results/tableResults.vue
new file mode 100644
index 000000000..a1f2cf34d
--- /dev/null
+++ b/src/modules/14_KPI/components/results/tableResults.vue
@@ -0,0 +1,12 @@
+<script setup lang="ts">
+/**
+ * props
+ */
+const tab = defineModel<string>("tab", { required: true });
+</script>
+
+<template>
+  {{ tab }}
+</template>
+
+<style scoped></style>
diff --git a/src/modules/14_KPI/router.ts b/src/modules/14_KPI/router.ts
index 79c2d697e..be79872b2 100644
--- a/src/modules/14_KPI/router.ts
+++ b/src/modules/14_KPI/router.ts
@@ -14,6 +14,7 @@ const listPage = () => import("@/modules/14_KPI/views/list.vue");
 const detailPage = () => import("@/modules/14_KPI/views/detail.vue");
 const reportPage = () => import("@/modules/14_KPI/views/report.vue");
 const detailView = () => import("@/modules/14_KPI/views/detailView.vue");
+const ResultsView = () => import("@/modules/14_KPI/views/resultsMain.vue");
 
 export default [
   {
@@ -68,4 +69,15 @@ export default [
       Role: "evaluateKPI",
     },
   },
+
+  {
+    path: "/KPI/results",
+    name: "KPIResults",
+    component: ResultsView,
+    meta: {
+      Auth: true,
+      Key: [1.1],
+      Role: "evaluateKPI",
+    },
+  },
 ];
diff --git a/src/modules/14_KPI/views/resultsMain.vue b/src/modules/14_KPI/views/resultsMain.vue
new file mode 100644
index 000000000..e10b62667
--- /dev/null
+++ b/src/modules/14_KPI/views/resultsMain.vue
@@ -0,0 +1,99 @@
+<script setup lang="ts">
+import { ref, onMounted, watch } from "vue";
+import { useQuasar } from "quasar";
+import http from "@/plugins/http";
+import config from "@/app.config";
+
+/**
+ * import type
+ */
+import type { ItemsTab } from "@/modules/14_KPI/interface/index/Main";
+
+/**
+ * import components
+ */
+import TableResults from "@/modules/14_KPI/components/results/tableResults.vue";
+
+/**
+ * importStore
+ */
+import { useCounterMixin } from "@/stores/mixin";
+
+/**
+ *  use
+ */
+const $q = useQuasar();
+const { dialogRemove, messageError, showLoader, hideLoader, success } =
+  useCounterMixin();
+
+/**
+ * ตัวแปร
+ */
+const tab = ref<string>("COMPLETE");
+const tabItems = ref<ItemsTab[]>([
+  { name: "COMPLETE", label: " รอประกาศผล" },
+  { name: "KP7", label: "ประกาศผลแล้ว" },
+]);
+
+const page = ref<number>(1);
+const pageSize = ref<number>(10);
+
+function fetcDatahList() {
+  showLoader();
+  http
+    .post(config.API.evaluationUser, {
+      status: tab.value,
+      page: page.value,
+      pageSize: pageSize.value,
+    })
+    .then((res) => {})
+    .catch((err) => {
+      messageError($q, err);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+watch(tab, () => {
+  page.value = 1;
+  pageSize.value = 10;
+  fetcDatahList();
+});
+
+onMounted(() => {
+  fetcDatahList();
+});
+</script>
+
+<template>
+  <div class="toptitle text-dark col-12 row items-center">ประกาศผล</div>
+
+  <q-card flast bordered>
+    <q-tabs
+      v-model="tab"
+      dense
+      align="left"
+      inline-label
+      class="bg-white text-grey"
+      active-color="primary"
+      indicator-color="primary"
+    >
+      <div v-for="item in tabItems">
+        <q-tab :name="item.name" :label="item.label" />
+      </div>
+    </q-tabs>
+    <q-separator />
+    <q-tab-panels v-model="tab" animated class="shadow-2 rounded-borders">
+      <q-tab-panel name="COMPLETE">
+        <TableResults :tab="tab" />
+      </q-tab-panel>
+
+      <q-tab-panel name="KP7">
+        <TableResults :tab="tab" />
+      </q-tab-panel>
+    </q-tab-panels>
+  </q-card>
+</template>
+
+<style scoped></style>

From f8da86524b07200f67e44dcabc237c1c7b01fbbc Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 9 Jul 2024 14:19:59 +0700
Subject: [PATCH 09/10] fixing

---
 src/modules/13_salary/views/salaryEmployeeRate.vue | 2 +-
 src/modules/13_salary/views/salaryRate.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/13_salary/views/salaryEmployeeRate.vue b/src/modules/13_salary/views/salaryEmployeeRate.vue
index a2bbab67a..b95a7b35b 100644
--- a/src/modules/13_salary/views/salaryEmployeeRate.vue
+++ b/src/modules/13_salary/views/salaryEmployeeRate.vue
@@ -243,7 +243,7 @@ onMounted(async () => {
         class="q-mr-sm"
         @click="router.go(-1)"
       />
-      อัตราค่าจ้าง กลุ่มที่{{ groupSalary }}
+      อัตราค่าจ้างของ กลุ่มที่ {{ groupSalary }}
     </div>
   </div>
   <q-card flat bordered class="q-pa-md">
diff --git a/src/modules/13_salary/views/salaryRate.vue b/src/modules/13_salary/views/salaryRate.vue
index af6a9f1f9..c45838271 100644
--- a/src/modules/13_salary/views/salaryRate.vue
+++ b/src/modules/13_salary/views/salaryRate.vue
@@ -240,7 +240,7 @@ watch([() => formQuery.page, () => formQuery.pageSize], async () => {
         class="q-mr-sm"
         @click="router.go(-1)"
       />
-      อัตราเงินเดือน ของ{{ posType }}
+      อัตราเงินเดือนของ {{ posType }}
     </div>
   </div>
   <q-card flat bordered class="q-pa-md">

From 094351585a0d89b60088e7bccb1c92124ad2f9df Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 9 Jul 2024 14:31:07 +0700
Subject: [PATCH 10/10] fixing

---
 .../components/DialogHistoryPos.vue           | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/modules/02_organizationalNew/components/DialogHistoryPos.vue b/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
index 9d930848f..1ca12daf7 100644
--- a/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
+++ b/src/modules/02_organizationalNew/components/DialogHistoryPos.vue
@@ -58,6 +58,42 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "orgShortName",
+    align: "left",
+    label: "อักษรย่อ",
+    sortable: true,
+    field: "orgShortName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posMasterNoPrefix",
+    align: "left",
+    label: " Prefix ตำแหน่งเลขที่",
+    sortable: true,
+    field: "posMasterNoPrefix",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posMasterNo",
+    align: "left",
+    label: "ตำแหน่งเลขที่",
+    sortable: true,
+    field: "posMasterNo",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posMasterNoSuffix",
+    align: "left",
+    label: "Suffix ตำแหน่งเลขที่",
+    sortable: true,
+    field: "posMasterNoSuffix",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "position",
     align: "left",
@@ -97,15 +133,6 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "orgShortName",
-    align: "left",
-    label: "อักษรย่อ",
-    sortable: true,
-    field: "orgShortName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "lastUpdatedAt",
     align: "left",
@@ -117,33 +144,6 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "posMasterNoPrefix",
-    align: "left",
-    label: " Prefix ตำแหน่งเลขที่",
-    sortable: true,
-    field: "posMasterNoPrefix",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posMasterNo",
-    align: "left",
-    label: "ตำแหน่งเลขที่",
-    sortable: true,
-    field: "posMasterNo",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posMasterNoSuffix",
-    align: "left",
-    label: "Suffix ตำแหน่งเลขที่",
-    sortable: true,
-    field: "posMasterNoSuffix",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
 ]);
 const rows = ref<HistoryPos[]>([]);