Merge branch 'develop' into devTee

src/modules/03_retire/views/addRetire.vue

@@ -205,7 +205,10 @@ onMounted(async () => {
             />
 
             <q-btn
-              v-else-if="dataDetail.statusMain === 'CANCEL' && dataStore.officerType == 'OFFICER'"
+              v-else-if="
+                dataDetail.statusMain === 'CANCEL' &&
+                dataStore.officerType == 'OFFICER'
+              "
               unelevated
               color="red"
               label="ติดตามสถานะยกเลิกการขอลาออก"
@@ -606,12 +609,16 @@ onMounted(async () => {
           dataStore.officerType == 'OFFICER'
         "
       >
-        <Workflow :id="id" sys-name="SYS_RETIREMENT" />
+        <Workflow :id="id" sys-name="SYS_RESIGN" />
       </div>
     </div>
   </div>
 
-  <Dialog v-model:modal="modal" :fectData="fectDataresign" v-model:link="link"/>
+  <Dialog
+    v-model:modal="modal"
+    :fectData="fectDataresign"
+    v-model:link="link"
+  />
 
   <q-dialog v-model="modalWorkflow" persistent>
     <q-card style="width: 700px; max-width: 80vw">

src/modules/05_leave/components/DialogDetail.vue

@@ -503,7 +503,11 @@ watch(
                 leaveStatus != 'DRAFT' && mainStore.officerType == 'OFFICER'
               "
               :id="props.leaveId"
-              sys-name="SYS_LEAVE_LIST"
+              :sys-name="
+                mainStore.officerType == 'OFFICER'
+                  ? 'SYS_LEAVE_LIST'
+                  : 'SYS_LEAVE_LIST_EMP'
+              "
             />
           </div>