API การลา ข้าราชการ, ลูกจ้าง

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

@@ -20,9 +20,7 @@ import type {
 } from "@/modules/06_retirement/interface/response/Main";
 
 import DialogAddCommander from "@/modules/06_retirement/components/DialogAddCommander.vue";
-import PopupPersonal from "@/components/Dialogs/PopupPersonal.vue";
 import CardProfile from "@/components/CardProfile.vue";
-import WorkFlow from "@/components/Workflow/Main.vue";
 
 /** Use */
 const $q = useQuasar();
@@ -39,22 +37,14 @@ const {
   showLoader,
   hideLoader,
   success,
-
   dialogConfirm,
-  dialogRemove,
 } = mixin;
 
 /** ตัวแปร */
 const roleUser = ref<string>("");
 const dataProfile = ref<DataProfile>();
+const approveStep = ref<string>("");
 
-const approveCheck = computed(() => {
-  return (
-    rowsApprover.value?.commanders?.every(
-      (commander) => commander.approveStatus === "APPROVE"
-    ) ?? false
-  );
-});
 const idCheck = computed(() => {
   if (
     typeAdd.value == "COMMANDER" &&
@@ -75,29 +65,6 @@ const idCheck = computed(() => {
   }
 });
 
-const approvePendingCheck = computed(() => {
-  const commanders = rowsApprover.value?.commanders || [];
-  const index = commanders.findIndex((c) => c.profileId === keycloakId.value);
-
-  if (index === -1) {
-    return false;
-  }
-
-  const currentCommander = commanders[index];
-
-  if (currentCommander.approveStatus !== "PENDING") {
-    return false;
-  }
-
-  if (index === 0) {
-    return true;
-  }
-
-  const previousApproved = commanders
-    .slice(0, index)
-    .every((c) => c.approveStatus === "APPROVE");
-  return previousApproved;
-});
 const isOfficer = ref<boolean>(false);
 const profileType = ref<string>("");
 const keycloakUserId = ref<string>("");
@@ -155,15 +122,6 @@ const columnsCommanders = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "rejectDate",
-    align: "left",
-    label: "วันสุดท้ายที่ยับยั้ง",
-    field: "rejectDate",
-    sortable: true,
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
 ]);
 
 const id = ref<string>(route.params.id.toString());
@@ -193,7 +151,6 @@ const dataDetail = ref<any>({
   statusMain: "",
 });
 
-const workflowRef = ref<any>(null);
 const organizationPositionOld = ref<string>("");
 const positionTypeOld = ref<string>("");
 const positionLevelOld = ref<string>("");
@@ -210,32 +167,16 @@ const actionPass = ref<boolean>(false);
 const reasonReign = ref<string>("");
 const dateBreak = ref<Date | null>(null);
 
-const isCheckData = computed(() => {
-  if (
-    organizationPositionOld.value !== "" &&
-    positionTypeOld.value !== "" &&
-    positionLevelOld.value !== "" &&
-    posNo.value !== "" &&
-    date.value !== null &&
-    dataDetail.value.commanderReject !== null &&
-    dataDetail.value.oligarchReject !== null
-  ) {
-    return true;
-  } else return false;
-});
-
 /**เปิด-ปิด modal */
 function closeModal() {
   modal.value = false;
 }
-function openModal() {
-  modal.value = true;
-}
 
 const isNoDebt = ref<boolean>(false);
 const isNoBurden = ref<boolean>(false);
 const isDiscipline = ref<boolean>(false);
 
+/** ฟังก์ชันคำนวนวันที่ขอลาออกจากราชการ*/
 function diffDate() {
   if (date.value !== null && dateLeave.value !== null) {
     const time = dateLeave.value.getTime() - date.value.getTime();
@@ -249,9 +190,11 @@ function diffDate() {
   return false;
 }
 
-/** นำข้อมูลมาจาก API*/
+/**
+ * ฟังก์ชันดึงข้อมูลรายละเอียดการยกเลิกลาออก
+ * @param id  รายการยกเลิกลาออก
+ */
 async function fetchData(id: string) {
-  showLoader();
   await http
     .get(config.API.listResignEMP() + `/cancel/${id}`)
     .then(async (res) => {
@@ -268,43 +211,55 @@ async function fetchData(id: string) {
       dateLeave.value = data.activeDate ? new Date(data.activeDate) : null;
       reason.value = data.reason ?? "";
       location.value = data.location ?? "";
+      approveStep.value = data.approveStep ?? "";
       status.value = data.status ?? "";
       remarkHorizontal.value = data.remarkHorizontal ?? "-";
       isNoDebt.value = data.isNoDebt;
       statusCheck.value = data.status;
       isNoBurden.value = data.isNoBurden;
       isDiscipline.value = data.isDiscipline;
+      profileType.value = data.profileType;
+      keycloakUserId.value = data.keycloakUserId;
+
+      rowsApprover.value = {
+        commanders: data.commanders,
+        approvers: data.approvers,
+      };
     })
     .catch((e) => {
       messageError($q, e);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
-/**Pop up */
+/**
+ * ฟังก์ชันเปิด popup  อนุญาต,ไม่อนุญาต
+ * @param action   อนุญาต, ไม่อนุญาต
+ * @param type ผู้บังคับบัญชา, ผู้มีอำนาจ
+ */
 function popUp(action: "pass" | "passNot", type: string) {
   reasonReign.value = "";
   dateBreak.value = null;
   actionPass.value = action === "pass";
   roleUser.value = type;
-  openModal();
+  modal.value = true;
 }
 
-//เงื่อนไขpop up
+/** ฟังก์ชันยืนยันการอนุญาตผลการพิจารณา*/
 function onSubmit() {
   dialogConfirm($q, async () => {
     showLoader();
     const body = {
       reason: reasonReign.value,
-      reject: !actionPass.value,
+      Date: new Date(),
     };
+    const action = actionPass.value ? "approve" : "reject";
+
+    const endpoint =
+      roleUser.value === "commander"
+        ? config.API.comanderCancelResign("-employee", action, id.value)
+        : config.API.approverCancelResign("-employee", action, id.value);
     await http
-      .put(
-        config.API.resignRejectEMP(`${roleUser.value}-cancel`, id.value),
-        body
-      )
+      .put(endpoint, body)
       .then(async () => {
         await fetchData(id.value);
         closeModal();
@@ -319,7 +274,7 @@ function onSubmit() {
   });
 }
 
-/** กดยกเลิก*/
+/** ฟังก์ชันยกเลิกการแก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย*/
 async function clickCancel() {
   edit.value = false;
   const data = dataDetail.value;
@@ -342,7 +297,7 @@ async function clickCancel() {
   myForm.value?.resetValidation();
 }
 
-/** Function บันทึก ,แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย*/
+/** ฟังก์ชันบันทึกข้อมูลเพื่อลงบัญชีแนบท้าย*/
 function onSubmitAttached() {
   dialogConfirm($q, () => {
     const formData = new FormData();
@@ -377,7 +332,7 @@ function onSubmitAttached() {
 }
 
 /**
- * Function เพิ่ม Class เวลา Edit
+ * ฟังก์ชัน  Class เวลา Edit
  * @param val เมื่อเป็นEdit จะเปลี่ยน Class
  */
 function getClass(val: boolean) {
@@ -387,37 +342,18 @@ function getClass(val: boolean) {
   };
 }
 
-/** แปลง StatusOrder */
-function statusOrder(val: boolean) {
-  switch (val) {
-    case true:
-      return "ยับยั้ง";
-    case false:
-      return "อนุญาต";
-  }
-}
-
-const isDirector = ref<boolean>(false);
 const isStaff = ref<boolean>(false);
 
-function fetchCheckIsofficer() {
-  http
-    .get(config.API.workflowKeycloakSystem("RETIREMENT_CANCEL_EMP"))
-    .then((res) => {
-      isStaff.value = res.data.result.isStaff;
-      isDirector.value = res.data.result.isDirector;
-    })
-    .catch((err) => {
-      messageError($q, err);
-    });
-}
-
-/** เปิด POP UP  */
+/**
+ * ฟังกฺชันเปิด pop up เพิ่มรายชื่อพิจารณา
+ * @param type COMMANDER === ผู้บังคับบัญชา, APPROVER === ผู้มีอำนาจ
+ */
 function onAddPerson(type: string) {
   modalAdd.value = true;
   typeAdd.value = type;
 }
 
+/** ฟังก์ชันดึงข้อมูลสิทธ์ของผู้ใช่*/
 async function checkOfficer() {
   try {
     const data = await fetchDataCheckIsoffice("SYS_RESIGN_EMP");
@@ -428,27 +364,31 @@ async function checkOfficer() {
   }
 }
 
+/** ฟังก์ชันยืนยันการส่งไปพิจารณา*/
 function onSend() {
   dialogConfirm(
     $q,
-    () => {
+    async () => {
       showLoader();
-      http
-        .get(config.API.sendApproveRetirement("-employee", id.value))
-        .then(async (res) => {
+      await http
+        .get(config.API.officerCancelResign("-employee", id.value))
+        .then(async () => {
           await fetchData(id.value);
           success($q, "ส่งไปพิจารณา");
         })
         .catch((e) => {
           messageError($q, e);
         })
-        .finally(() => {});
+        .finally(() => {
+          hideLoader();
+        });
     },
     "ยืนยันการส่งไปพิจารณา",
     "ต้องการส่งไปพิจารณาใช่หรือไม่"
   );
 }
 
+/** ฟังก์ชันดึงข้อมูลตำแหน่งจาก Keycloak*/
 async function fetchKeycloakPosition() {
   if (keycloakId.value == "") {
     await http
@@ -465,11 +405,14 @@ async function fetchKeycloakPosition() {
 
 /** Hook */
 onMounted(async () => {
+  showLoader();
   await Promise.all([
-    await fetchKeycloakPosition(),
     fetchData(id.value),
+    fetchKeycloakPosition(),
     checkOfficer(),
-  ]);
+  ]).finally(() => {
+    hideLoader();
+  });
 });
 </script>
 
@@ -487,7 +430,9 @@ onMounted(async () => {
         @click="router.push('/retirement/resign-employee')"
       />
       รายละเอียดการยกเลิกลาออก
-      {{ dataDetail.prefix.dataDetail.firstName + "  " + dataDetail.lastName }}
+      {{
+        dataDetail.prefix + dataDetail.firstName + "  " + dataDetail.lastName
+      }}
     </div>
 
     <CardProfile :type="'employee'" :data="dataProfile as DataProfile" />
@@ -496,39 +441,6 @@ onMounted(async () => {
     <q-card bordered class="row col-12 text-dark q-mt-sm">
       <div class="bg-grey-1 q-pa-sm col-12 row items-center text-primary">
         <div class="q-pl-sm text-weight-bold text-dark">ข้อมูลการลาออก</div>
-        <!-- <q-space />
-        <div
-          class="q-gutter-x-sm"
-          v-if="
-            (roleUser === 'officer' && dataDetail.officerReject === null) ||
-            (roleUser === 'commander' &&
-              dataDetail.commanderReject === null &&
-              dataDetail.officerReject !== null) ||
-            (roleUser === 'oligarch' &&
-              dataDetail.oligarchReject === null &&
-              dataDetail.commanderReject !== null &&
-              dataDetail.officerReject !== null)
-          "
-        >
-          <q-btn
-            outline
-            color="primary"
-            dense
-            icon-right="check"
-            class="q-px-sm"
-            label="อนุญาต"
-            @click="popUp('pass')"
-          />
-          <q-btn
-            outline
-            color="red"
-            dense
-            icon-right="close"
-            class="q-px-sm"
-            label="ยับยั้ง"
-            @click="popUp('passNot')"
-          />
-        </div> -->
       </div>
       <div class="col-12"><q-separator /></div>
       <div class="row col-12 q-pa-md">
@@ -587,7 +499,7 @@ onMounted(async () => {
           ผลการพิจารณาของผู้บังคับบัญชา
         </div>
         <q-btn
-          v-if="statusCheck == 'WAITTING' && (isOfficer || isStaff)"
+          v-if="!checkRoutePermisson && isStaff && approveStep === 'st1'"
           flat
           round
           icon="add"
@@ -599,33 +511,6 @@ onMounted(async () => {
           <q-tooltip>เพิ่มรายชื่อผู้บังคับบัญชา</q-tooltip>
         </q-btn>
         <q-space />
-        <!-- <div
-          class="q-gutter-x-sm"
-          v-if="
-            isDirector &&
-            dataDetail.commanderReject === null &&
-            dataDetail.statusMain === 'WAITTING'
-          "
-        >
-          <q-btn
-            outline
-            color="primary"
-            dense
-            icon-right="check"
-            class="q-px-sm"
-            label="อนุญาต"
-            @click="popUp('pass', 'commander')"
-          />
-          <q-btn
-            outline
-            color="red"
-            dense
-            icon-right="close"
-            class="q-px-sm"
-            label="ยับยั้ง"
-            @click="popUp('passNot', 'commander')"
-          />
-        </div> -->
       </div>
 
       <div class="col-12"><q-separator /></div>
@@ -656,25 +541,19 @@ onMounted(async () => {
                 </div>
                 <div v-else-if="col.name == 'comment'">
                   <div
+                    class="q-gutter-x-xs"
                     v-if="
                       props.row.approveStatus == 'PENDING' &&
-                      props.row.comment == ''
+                      props.row.comment == '' &&
+                      approveStep === 'st2'
                     "
                   >
                     <q-btn
-                      :disable="
-                        statusCheck == 'NEW' ||
-                        !approvePendingCheck ||
-                        (props.row.profileId !== keycloakId &&
-                          checkPermission($route)?.attrIsUpdate)
-                      "
-                      :outline="
-                        props.row.profileId !== keycloakId ||
-                        statusCheck == 'NEW' ||
-                        !approvePendingCheck
-                          ? false
-                          : true
+                      v-if="
+                        props.row.profileId === keycloakId &&
+                        approveStep === 'st2'
                       "
+                      outline
                       dense
                       color="primary"
                       icon-right="check"
@@ -683,24 +562,16 @@ onMounted(async () => {
                       @click="popUp('pass', 'commander')"
                     />
                     <q-btn
-                      :disable="
-                        statusCheck == 'NEW' ||
-                        !approvePendingCheck ||
-                        (props.row.profileId !== keycloakId &&
-                          checkPermission($route)?.attrIsUpdate)
-                      "
-                      :outline="
-                        props.row.profileId !== keycloakId ||
-                        statusCheck == 'NEW' ||
-                        !approvePendingCheck
-                          ? false
-                          : true
+                      v-if="
+                        props.row.profileId === keycloakId &&
+                        approveStep === 'st2'
                       "
+                      outline
                       color="red"
                       dense
                       icon-right="close"
                       class="q-px-sm"
-                      label="ยับยั้ง"
+                      label="ไม่อนุญาต"
                       @click="popUp('passNot', 'commander')"
                     />
                   </div>
@@ -711,7 +582,7 @@ onMounted(async () => {
                 <div v-else-if="col.name == 'approveStatus'">
                   {{
                     props.row.approveStatus
-                      ? convertStatusText(props.row.approveStatus)
+                      ? convertStatusText(props.row.approveStatus, "ไม่อนุญาต")
                       : "-"
                   }}
                 </div>
@@ -732,7 +603,8 @@ onMounted(async () => {
           ผลการพิจารณาของผู้มีอำนาจ
         </div>
         <q-btn
-          v-if="statusCheck == 'WAITTING' && (isOfficer || isStaff)"
+          q-btn
+          v-if="!checkRoutePermisson && isStaff && approveStep === 'st1'"
           flat
           round
           icon="add"
@@ -748,14 +620,12 @@ onMounted(async () => {
         <div
           class="q-gutter-x-sm"
           v-if="
-            checkPermission($route)?.attrIsUpdate &&
-            dataDetail.oligarchReject === null &&
-            dataDetail.statusMain === 'WAITTING' &&
+            !checkRoutePermisson &&
             rowsApprover &&
             rowsApprover.approvers &&
             rowsApprover.approvers[0]?.profileId == keycloakId &&
             rowsApprover.approvers[0]?.approveStatus == 'PENDING' &&
-            approveCheck
+            approveStep === 'st3'
           "
         >
           <q-btn
@@ -773,7 +643,7 @@ onMounted(async () => {
             dense
             icon-right="close"
             class="q-px-sm"
-            label="ยับยั้ง"
+            label="ไม่อนุญาต"
             @click="popUp('passNot', 'oligarch')"
           />
         </div>
@@ -800,28 +670,24 @@ onMounted(async () => {
                 rowsApprover &&
                 rowsApprover.approvers &&
                 rowsApprover.approvers[0]?.approveStatus
-                  ? convertStatusText(rowsApprover?.approvers[0].approveStatus)
+                  ? convertStatusText(
+                      rowsApprover?.approvers[0].approveStatus,
+                      "ไม่อนุญาต"
+                    )
                   : "-"
               }}
             </div>
           </div>
-          <!-- <div class="col-xs-6 row items-start">
-            <div class="col-12 text-top">วันสุดท้ายที่ยับยั้ง</div>
-            <div class="col-12 text-detail">
-              {{
-                dataDetail.oligarchRejectDate !== null
-                  ? date2Thai(dataDetail.oligarchRejectDate)
-                  : "-"
-              }}
-            </div>
-          </div> -->
+
           <div class="col-xs-12 row items-start">
             <div class="col-12 text-top">ความคิดเห็นและเหตุผล</div>
             <div class="col-12 text-detail">
               {{
-                dataDetail.oligarchReject
-                  ? dataDetail.oligarchApproveReason
-                  : dataDetail.oligarchApproveReason
+                rowsApprover &&
+                rowsApprover.approvers &&
+                rowsApprover.approvers[0]?.comment
+                  ? rowsApprover?.approvers[0].comment
+                  : "-"
               }}
             </div>
           </div>
@@ -831,7 +697,7 @@ onMounted(async () => {
     <q-card
       bordered
       class="row col-12 text-dark q-mt-sm q-pa-sm"
-      v-if="statusCheck == 'WAITTING' && (isOfficer || isStaff)"
+      v-if="!checkRoutePermisson && isStaff && approveStep === 'st1'"
     >
       <q-btn
         @click="onSend"
@@ -863,8 +729,9 @@ onMounted(async () => {
           <div
             v-if="
               !checkRoutePermisson &&
-              isStaff &&
-              dataDetail.statusMain === 'WAITTING'
+              (dataDetail.statusMain === 'APPROVE' ||
+                dataDetail.statusMain === 'REJECT') &&
+              isStaff
             "
           >
             <div class="q-gutter-sm" v-if="!edit">
@@ -1103,7 +970,7 @@ onMounted(async () => {
       <q-form greedy @submit.prevent @validation-success="onSubmit">
         <DialogHeader
           :tittle="`${
-            actionPass ? 'อนุญาตยกเลิกการลาออก' : 'ยับยั้งยกเลิกการลาออก'
+            actionPass ? 'อนุญาตยกเลิกการลาออก' : 'ไม่อนุญาตยกเลิกการลาออก'
           }`"
           :close="closeModal"
         />
@@ -1137,7 +1004,7 @@ onMounted(async () => {
   <DialogAddCommander
     v-model:modal="modalAdd"
     :type="typeAdd"
-    :profileType="'officer'"
+    :profileType="'-employee'"
     :get-data="fetchData"
     :id-check="idCheck"
     :keycloak-user-id="keycloakUserId"