From 1eead8c5796b64ff760109b39b5c223d648e3905 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 17 Oct 2024 17:43:45 +0700
Subject: [PATCH] workflow

---
 src/modules/03_retire/views/addRetire.vue        | 14 ++++++++++++--
 src/modules/05_leave/components/DialogDetail.vue |  5 +++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue
index c745494..cb2ea06 100644
--- a/src/modules/03_retire/views/addRetire.vue
+++ b/src/modules/03_retire/views/addRetire.vue
@@ -9,6 +9,7 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 
 import Dialog from "@/modules/03_retire/views/DialogRetire.vue";
+import Workflow from "@/components/Workflow/Main.vue";
 
 const $q = useQuasar();
 const route = useRoute();
@@ -25,7 +26,11 @@ const {
   dialogConfirm,
 } = mixin;
 
-const id = ref<string>(""); //เก็บ id path
+const id = ref<string>(
+  router.currentRoute.value.name !== "AddRetire"
+    ? route.params.id.toString()
+    : ""
+); //เก็บ id path
 const myform = ref<QForm | null>(null); //form
 const tranferOrg = ref(""); //สถานที่ยื่นขอลาออกจากราชการ
 const dateCommand = ref<Date>(new Date()); //วันที่ยื่นขอลาออกจากราชการ
@@ -155,11 +160,11 @@ function downloadFile(data: string) {
  */
 onMounted(() => {
   if (route.params.id !== undefined) {
-    id.value = route.params.id.toString();
     fectDataresign(id.value);
   }
 });
 </script>
+
 <template>
   <div class="col-12 row justify-center">
     <div class="col-xs-12 col-sm-12 col-md-11">
@@ -498,6 +503,7 @@ onMounted(() => {
                     </div>
                   </q-card>
                 </div>
+
                 <div class="col-12 row" v-if="routeName != 'AddRetire'">
                   <q-card bordered class="row col-12 text-dark q-mt-sm">
                     <div
@@ -561,6 +567,10 @@ onMounted(() => {
                     </div>
                   </q-card>
                 </div>
+
+                <div class="col-12 row" v-if="routeName != 'AddRetire'">
+                  <Workflow :id="id" sys-name="RETIREMENT_RESIFNATION" />
+                </div>
               </div>
             </div>
           </div>
diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue
index 7f1c52d..29b3c21 100644
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@@ -16,6 +16,7 @@ import type {
 } from "@/modules/05_leave/interface/response/leave";
 
 import DialogHeader from "@/components/DialogHeader.vue";
+import Workflow from "@/components/Workflow/Main.vue"
 import FormLeave from "@/modules/05_leave/components/formDetail/01_SickForm.vue";
 import FormChildbirth from "@/modules/05_leave/components/formDetail/04_HelpWifeBirthForm.vue";
 import FormHoliday from "@/modules/05_leave/components/formDetail/05_VacationForm.vue";
@@ -76,8 +77,6 @@ const props = defineProps({
   },
 });
 
-/**checkForm Form การลา*/
-
 /** Form รายละเอียดข้อมูล*/
 const formData = reactive<FremDetail>({
   id: "", //Id การยื่นขอลา
@@ -495,6 +494,8 @@ watch(
               v-else-if="checkForm === 'FormVocationalRehabilitation'"
               :data="formData"
             />
+
+            <Workflow :id="props.leaveId" sys-name="LEAVE_LIST" />
           </div>
 
           <div