From 7a3ffc432dda8c8894ffeaa25cbdd15d794da63a Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 14 Nov 2024 16:37:31 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=82=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=94=E0=B8=87=E0=B9=80=E0=B8=89=E0=B8=9E=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A2=E0=B8=B7=E0=B9=88?=
 =?UTF-8?q?=E0=B8=99=E0=B9=83=E0=B8=9A=E0=B8=A5=E0=B8=B2=E0=B9=84=E0=B8=9B?=
 =?UTF-8?q?=E0=B9=81=E0=B8=A5=E0=B9=89=E0=B8=A7=E0=B9=80=E0=B8=97=E0=B9=88?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=B1=E0=B9=89=E0=B8=99=20=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B9=84?=
 =?UTF-8?q?=E0=B8=A1=E0=B9=88=E0=B8=A1=E0=B8=B5=20workflow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_leave/components/DialogDetail.vue        | 17 +++++++++++++++--
 src/stores/data.ts                              |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/modules/05_leave/components/DialogDetail.vue b/src/modules/05_leave/components/DialogDetail.vue
index 308e1f6..bb8965c 100644
--- a/src/modules/05_leave/components/DialogDetail.vue
+++ b/src/modules/05_leave/components/DialogDetail.vue
@@ -6,6 +6,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useLeaveStore } from "@/modules/05_leave/store";
+import { useDataStore } from "@/stores/data";
 
 /** import type*/
 import type {
@@ -32,6 +33,7 @@ import FormCancel from "@/modules/05_leave/components/formDetail/formCancel.vue"
 
 const $q = useQuasar();
 const dataStore = useLeaveStore();
+const mainStore = useDataStore();
 const { convertStatud } = dataStore;
 const mixin = useCounterMixin();
 const {
@@ -495,7 +497,14 @@ watch(
               :data="formData"
             />
 
-            <Workflow :id="props.leaveId" sys-name="SYS_LEAVE_LIST" />
+            <!-- ข้าราชการแสดงเฉพาะที่ยื่นใบลาไปแล้วเท่านั้น ลูกจ้างไม่มี workflow -->
+            <Workflow
+              v-if="
+                leaveStatus != 'DRAFT' && mainStore.officerType == 'OFFICER'
+              "
+              :id="props.leaveId"
+              sys-name="SYS_LEAVE_LIST"
+            />
           </div>
 
           <div
@@ -553,7 +562,11 @@ watch(
       </q-card-section>
     </q-card>
 
-    <q-card q-card v-if="props.leaveStatus === 'DELETE'">
+    <q-card
+      q-card
+      v-if="props.leaveStatus === 'DELETE'"
+      style="min-width: 40vw"
+    >
       <DialogHeader
         :tittle="`${titleMainCancle} ${titleName}`"
         :close="props.onClickClose"
diff --git a/src/stores/data.ts b/src/stores/data.ts
index 67ce1db..7eab5ce 100644
--- a/src/stores/data.ts
+++ b/src/stores/data.ts
@@ -8,7 +8,7 @@ import { useRegistryInFormationStore } from "@/modules/10_registry/store/registr
 import { useCounterMixin } from "./mixin";
 import type { ProfileData } from "@/interface/Main";
 
-export const useDataStore = defineStore("data", () => {
+export const useDataStore = defineStore("dataMain", () => {
   const storeRegistry = useRegistryInFormationStore();
   const $q = useQuasar();
   const mixin = useCounterMixin();