From 6bc00f9064865a9f5bb020e1d94f2b04ab6bc4eb Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 18 Oct 2024 14:51:42 +0700
Subject: [PATCH] update workflow

---
 src/components/Workflow/DialogSelectPerson.vue | 6 +++---
 src/components/Workflow/Main.vue               | 5 ++++-
 src/modules/03_retire/views/addRetire.vue      | 8 ++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/Workflow/DialogSelectPerson.vue b/src/components/Workflow/DialogSelectPerson.vue
index 79cd338..135216f 100644
--- a/src/components/Workflow/DialogSelectPerson.vue
+++ b/src/components/Workflow/DialogSelectPerson.vue
@@ -16,7 +16,7 @@ const { dialogConfirm, showLoader, hideLoader, messageError } =
   useCounterMixin();
 
 const modal = defineModel<boolean>("modal", { required: true });
-const { stateId, fetchData } = defineProps({
+const props = defineProps({
   stateId: { type: String, require: true },
   fetchData: { type: Function, require: true },
 });
@@ -91,14 +91,14 @@ function onSubmit() {
     showLoader();
     await http
       .post(config.API.workflow + `add-step`, {
-        stateId: stateId,
+        stateId: props.stateId,
         profileId: selected.value[0].id,
         isAcceptSetting: isAcceptSetting.value,
         isApproveSetting: isApproveSetting.value,
         isReasonSetting: isReasonSetting.value,
       })
       .then(async () => {
-        await fetchData?.();
+        await props.fetchData?.();
         onCloseModal();
       })
       .catch((err) => {
diff --git a/src/components/Workflow/Main.vue b/src/components/Workflow/Main.vue
index 2bcc5d0..cc3c2b9 100644
--- a/src/components/Workflow/Main.vue
+++ b/src/components/Workflow/Main.vue
@@ -47,7 +47,10 @@ async function fetchCheckState() {
       await fetchData();
       const data = await res.data.result;
       stateId.value = data.stateId;
-      state.value = data.stateNo === 4 ? 5 : data.stateNo;
+      state.value =
+        data.stateNo === itemState.value.length
+          ? data.stateNo + 1
+          : data.stateNo;
       permission.value = {
         isChangeState: data.can_change_state,
         isOperate: data.can_operate,
diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue
index cb2ea06..a5504d2 100644
--- a/src/modules/03_retire/views/addRetire.vue
+++ b/src/modules/03_retire/views/addRetire.vue
@@ -34,7 +34,7 @@ const id = ref<string>(
 const myform = ref<QForm | null>(null); //form
 const tranferOrg = ref(""); //สถานที่ยื่นขอลาออกจากราชการ
 const dateCommand = ref<Date>(new Date()); //วันที่ยื่นขอลาออกจากราชการ
-const dateLeave = ref<Date>(new Date()); //วันที่ขอลาออกจากราชการ
+const dateLeave = ref<Date | null>(null); //วันที่ขอลาออกจากราชการ
 const noteReason = ref(""); //เหตุผลที่ลาออกจากราชการ
 const modal = ref<boolean>(false); //ตัวแปร dialog
 
@@ -83,10 +83,14 @@ async function onSubmit() {
     $q,
     () => {
       showLoader();
+
       const formData = new FormData();
       formData.append("Location", tranferOrg.value);
       formData.append("SendDate", dateToISO(dateCommand.value));
-      formData.append("ActiveDate", dateToISO(dateLeave.value));
+      formData.append(
+        "ActiveDate",
+        dateLeave.value !== null ? dateToISO(dateLeave.value) : ""
+      );
       formData.append("Reason", noteReason.value);
       formData.append("file", files.value);