รายการเลื่อนเงินเดือนลูกจ้างประจำ

src/modules/13_salary/components/SalaryEmployeeLists/DialogAddPerson.vue

@@ -64,27 +64,27 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "position",
     align: "left",
-    label: "ตำแหน่งในสายงาน",
+    label: "ตำแหน่ง",
     sortable: true,
     field: "position",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
   {
-    name: "posType",
+    name: "posTypeName",
     align: "left",
-    label: "ประเภทตำเเหน่ง",
+    label: "กลุ่มงาน",
     sortable: true,
-    field: "posType",
+    field: "posTypeName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
   {
-    name: "posLevel",
+    name: "posLevelName",
     align: "left",
-    label: "ระดับตำเเหน่ง",
+    label: "ระดับชั้นงาน",
     sortable: true,
-    field: "posLevel",
+    field: "posLevelName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -112,11 +112,19 @@ function closeModal() {
 /** function เรียกรายชื่อ คนเลื่อนเงินเดือน*/
 function fetchListPerson() {
   showLoader();
-  formFilter.rootId = store.rootId;
+  // formFilter.rootId = store.rootId;
-  formFilter.period = store.roundMainCode;
+  // formFilter.period = store.roundMainCode;
-  formFilter.year = store.roundYear;
+  // formFilter.year = store.roundYear;
+  const reqBody = {
+    posTypeId: "", // id ประเภทตำแหน่ง
+    posLevelId: "", // id ระดับตำแหน่ง
+    position: "", // ตำแหน่ง
+    page: formFilter.page, //*หน้า
+    pageSize: formFilter.pageSize, //*จำนวนแถวต่อหน้า
+    keyword: formFilter.keyword, //นามสกุล ชื่อ สกุล เลขบัตร
+  };
   http
-    .post(config.API.salaryListPerson, formFilter)
+    .post(config.API.orgSearchProfileEmp, reqBody)
     .then((res) => {
       const data = res.data.result.data;
       maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize);

src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue

@@ -68,38 +68,29 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
   {
-    name: "position",
+    name: "positionName",
     align: "left",
-    label: "ตำแหน่งในสายงาน",
+    label: "ตำแหน่ง",
     sortable: true,
-    field: "position",
+    field: "positionName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
   {
-    name: "posType",
+    name: "posTypeName",
     align: "left",
-    label: "ตำแหน่งประเภท",
+    label: "กลุ่มงาน",
     sortable: false,
-    field: "posType",
+    field: "posTypeName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
   {
-    name: "posLevel",
+    name: "posLevelName",
     align: "left",
-    label: "ระดับตำแหน่ง",
+    label: "ระดับชั้นงาน",
     sortable: false,
-    field: "posLevel",
+    field: "posLevelName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "posExecutive",
-    align: "left",
-    label: "ตำแหน่งทางการบริหาร",
-    sortable: false,
-    field: "posExecutive",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -146,10 +137,9 @@ const visibleColumns = ref<string[]>([
   "no",
   "posNo",
   "fullName",
-  "position",
+  "positionName",
-  "posType",
+  "posTypeName",
-  "posLevel",
+  "posLevelName",
-  "posExecutive",
   "amount",
   "amountUse",
   "positionSalaryAmount",

src/modules/13_salary/components/SalaryEmployeeLists/TableTypePending.vue

@@ -63,37 +63,28 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
   {
-    name: "posType",
+    name: "posTypeName",
     align: "left",
-    label: "ตำแหน่งประเภท",
+    label: "กลุ่มงาน",
     sortable: true,
-    field: "posType",
+    field: "posTypeName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
   {
-    name: "posExecutive",
+    name: "positionName",
     align: "left",
-    label: "ตำแหน่งทางการบริหาร",
+    label: "ตำแหน่ง",
-    sortable: true,
+    field: "positionName",
-    field: "posExecutive",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
-  {
-    name: "position",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    field: "position",
     sortable: true,
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
   {
-    name: "posLevel",
+    name: "posLevelName",
     align: "left",
-    label: "ระดับตำแหน่ง",
+    label: "ระดับชั้นงาน",
-    field: "posLevel",
+    field: "posLevelName",
     sortable: true,
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -174,10 +165,9 @@ const columns = ref<QTableProps["columns"]>([
 const visibleColumns = ref<string[]>([
   "no",
   "fullName",
-  "posType",
+  "posTypeName",
-  "posExecutive",
+  "positionName",
-  "position",
+  "posLevelName",
-  "posLevel",
   "amount",
   "organization",
   "result",

src/modules/13_salary/views/salaryEmployeeLists.vue

@@ -243,11 +243,6 @@ async function onChangeRound() {
   await getAgency(roundFilter.value.revisionId);
   await getAgencyPosition(roundFilter.value.revisionId);
   if (agencyFilter.value && roundFilter.value.id && snapFilter.value) {
-    // await fetchSalalyPeriod(
-    //   agencyFilter.value,
-    //   roundFilter.value.id,
-    //   snapFilter.value
-    // );
     store.tabType = "PENDING";
     store.roundMainCode = roundFilter.value.shortCode;
   } else {