Merge branch 'develop' into devTee

src/components/CardProfile.vue

@@ -151,7 +151,11 @@ watch(
         <div class="col-xs-6 col-sm-3 row">
           <div class="col-12">
             <div class="col-12 text-top">
-              {{ props.type == "employee" ? "กลุ่มงาน" : "ประเภทตำแหน่ง" }}
+              {{
+                props.type.toLowerCase() == "employee"
+                  ? "กลุ่มงาน"
+                  : "ประเภทตำแหน่ง"
+              }}
             </div>
             <div class="col-12 text-detail">
               {{ profile.positionLevel }}

src/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue

@@ -274,7 +274,7 @@ function fetchListHistory() {
   showLoader();
   http
     .get(
-      config.API.profileListSalaryPositionHistoryNew(
+      config.API.profileListSalaryHistoryNew(
         salaryId.value,
         empType.value
       )

src/modules/05_placement/store.ts

@@ -358,7 +358,6 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
       value: "ออกคำสั่งเสร็จแล้ว",
     },
   ]);
-  const statusOp = ref<DataOptions[]>([]);
   const statusMainOp = ref<DataOptions[]>([
     { id: "WAITTING", name: "รอดำเนินการ" },
     { id: "PENDING", name: "เลือกตำแหน่งแล้ว" },
@@ -367,6 +366,7 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
     { id: "REPORT", name: "ส่งรายชื่อไปออกคำสั่ง" },
     { id: "DONE", name: "ออกคำสั่งเสร็จแล้ว" },
   ]);
+  const statusOp = ref<DataOptions[]>(statusMainOp.value);
 
   const statusText = (val: string) => {
     switch (val) {

src/modules/06_retirement/components/03_resignEmp/ResignByid.vue

@@ -1279,9 +1279,9 @@ onMounted(async () => {
                   :readonly="!edit"
                   :borderless="!edit"
                   v-model="positionLevelOld"
-                  :rules="[(val:string) => !!val || `${'กรุณากรอกระดับตำแหน่ง'}`]"
+                  :rules="[(val:string) => !!val || `${'กรุณากรอกระดับชั้นงาน'}`]"
                   hide-bottom-space
-                  :label="`${'ระดับตำแหน่ง'}`"
+                  :label="`${'ระดับชั้นงาน'}`"
                 />
               </div>
             </div>

src/modules/06_retirement/components/06_dismissOrder/DetailEMP.vue

@@ -274,9 +274,9 @@ onMounted(async () => {
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="positionTypeOld"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกประเภทตำแหน่ง'}`]"
+                :rules="[(val:string) => !!val || `${'กรุณากรอกกลุ่มงาน'}`]"
                 hide-bottom-space
-                :label="`${'ประเภทตำแหน่ง'}`"
+                :label="`${'กลุ่มงาน'}`"
               />
             </div>
           </div>
@@ -290,9 +290,9 @@ onMounted(async () => {
                 :readonly="!edit"
                 :borderless="!edit"
                 v-model="positionLevelOld"
-                :rules="[(val:string) => !!val || `${'กรุณากรอกระดับ'}`]"
+                :rules="[(val:string) => !!val || `${'กรุณากรอกระดับชั้นงาน'}`]"
                 hide-bottom-space
-                :label="`${'ระดับ'}`"
+                :label="`${'ระดับชั้นงาน'}`"
               />
             </div>
           </div>

src/modules/06_retirement/views/06_dismissOrder.vue

@@ -10,6 +10,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { checkPermission } from "@/utils/permissions";
 import { useTransferDataStore } from "@/modules/05_placement/store";
 
+import type { DataOption } from "@/modules/06_retirement/interface/index/Main";
 import type { ResponseData } from "@/modules/06_retirement/interface/response/out";
 
 import DialogSendToCommand from "@/modules/06_retirement/components/06_dismissOrder/DialogSendToCommand.vue";
@@ -46,7 +47,6 @@ const visibleColumns = ref<string[]>([
 //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 const filterKeyword = ref<string>("");
 const filterKeyword2 = ref<string>("");
-const filterRef = ref<any>(null);
 
 //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 const rows = ref<ResponseData[]>([]);
@@ -157,11 +157,12 @@ async function getData() {
   showLoader();
   await http
     .get(config.API.retirementOut + `/officer?status=${status.value}`)
-    .then((res: any) => {
+    .then((res) => {
       const data = res.data.result;
       rows.value = data;
       rowsData.value = data;
       filters.value = data;
+      onSearch();
     })
     .catch((e) => {
       messageError($q, e);
@@ -223,7 +224,7 @@ onMounted(async () => {
               outlined
               dense
               label="สถานะ"
-              :options="store.statusOp.filter((item:any)=> item.id !== 'PENDING')"
+              :options="store.statusOp.filter((item:DataOption)=> item.id !== 'PENDING')"
               emit-value
               map-options
               option-label="name"
@@ -232,7 +233,7 @@ onMounted(async () => {
               use-input
               hide-selected
               bg-color="white"
-              @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn) "
+              @filter="(inputValue:string,doneFn:Function) => filterOption(inputValue, doneFn) "
               @update:model-value="(value:string)=>{(status = value),getData()}"
             >
               <template v-slot:no-option>
@@ -270,7 +271,6 @@ onMounted(async () => {
               standout
               dense
               v-model="filterKeyword"
-              ref="filterRef"
               outlined
               placeholder="ค้นหา"
               @keydown.enter="onSearch"

src/modules/06_retirement/views/08_dismissOrderEmp.vue

@@ -10,6 +10,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { checkPermission } from "@/utils/permissions";
 import { useTransferDataStore } from "@/modules/05_placement/store";
 
+import type { DataOption } from "@/modules/06_retirement/interface/index/Main";
 import type { ResponseData } from "@/modules/06_retirement/interface/response/out";
 
 import DialogSendToCommand from "@/modules/06_retirement/components/06_dismissOrder/DialogSendToCommandEmp.vue";
@@ -46,7 +47,6 @@ const visibleColumns = ref<string[]>([
 //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 const filterKeyword = ref<string>("");
 const filterKeyword2 = ref<string>("");
-const filterRef = ref<any>(null);
 
 //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 const rows = ref<ResponseData[]>([]);
@@ -157,18 +157,19 @@ async function getData() {
   showLoader();
   await http
     .get(config.API.retirementOut + `/employee?status=${status.value}`)
-    .then((res: any) => {
+    .then((res) => {
       const data = res.data.result;
       rows.value = data;
       rowsData.value = data;
       filters.value = data;
-      hideLoader();
+      onSearch();
     })
     .catch((e) => {
       messageError($q, e);
-      hideLoader();
     })
-    .finally(() => {});
+    .finally(() => {
+      hideLoader();
+    });
 }
 
 async function clickDelete(id: string) {
@@ -225,7 +226,7 @@ onMounted(async () => {
               outlined
               dense
               label="สถานะ"
-              :options="store.statusOp.filter((item:any)=> item.id !== 'PENDING')"
+              :options="store.statusOp.filter((item:DataOption)=> item.id !== 'PENDING')"
               emit-value
               map-options
               option-label="name"
@@ -234,7 +235,7 @@ onMounted(async () => {
               use-input
               hide-selected
               bg-color="white"
-              @filter="(inputValue:any,doneFn:Function) => filterOption(inputValue, doneFn) "
+              @filter="(inputValue:string,doneFn:Function) => filterOption(inputValue, doneFn) "
               @update:model-value="(value:string)=>{(status = value),getData()}"
             >
               <template v-slot:no-option>
@@ -272,7 +273,6 @@ onMounted(async () => {
               standout
               dense
               v-model="filterKeyword"
-              ref="filterRef"
               outlined
               placeholder="ค้นหา"
               @keydown.enter="onSearch"