Merge branch 'develop' into dev

src/modules/02_organization/components/DialogHistoryPos.vue

@@ -154,7 +154,7 @@ const baseColumns = ref<QTableProps["columns"]>([
     field: "lastUpdatedAt",
     sortable: false,
     format(val) {
-      return date2Thai(val);
+      return date2Thai(val, true, true);
     },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
@@ -265,15 +265,17 @@ watch(
               <q-td v-for="col in props.cols" :key="col.name" :props="props">
                 <div v-if="col.name == 'no'">
                   {{
-                    store.typeOrganizational === "current" ||
-                    (store.typeOrganizational === "draft" &&
-                      historyType === "OWNER_HISTORY")
+                    historyType === "OWNER_HISTORY"
                       ? props.rowIndex + 1
-                      : props.rowIndex + 1 == 1
+                      : props.rowIndex + 1 == 1 &&
+                        (store.typeOrganizational === "draft" ||
+                          store.typeOrganizational === "old")
                       ? "1 (แบบร่าง)"
-                      : props.rowIndex + 1 == 2
+                      : props.rowIndex + 1 == 2 &&
+                        (store.typeOrganizational === "draft" ||
+                          store.typeOrganizational === "old")
                       ? "2 (ปัจจุบัน)"
-                      : props.rowIndex + 1
+                      : props.rowIndex + 1 
                   }}
                 </div>
 

src/modules/06_retirement/components/02_resign/ResignByid.vue

@@ -10,6 +10,7 @@ import genReport from "@/plugins/genreport";
 import { useCounterMixin } from "@/stores/mixin";
 import { useRoleWorkflowDataStore } from "@/stores/roleWorkflow";
 import { useRetirementDataStore } from "@/modules/06_retirement/store/Main";
+import { checkPermission } from "@/utils/permissions";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 
@@ -766,7 +767,13 @@ onMounted(async () => {
       <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 v-if="isStaff && status === 'WAITTING'">
+        <div
+          v-if="
+            isStaff &&
+            status === 'WAITTING' &&
+            checkPermission($route)?.attrIsUpdate
+          "
+        >
           <q-btn
             outline
             color="primary"

src/modules/09_leave/components/05_Leave/DetailLeaveReject.vue

@@ -504,9 +504,10 @@ onMounted(async () => {
                 @click="
                   onClickDownloadFile(
                     formData.id,
-                    'ยกเลิก' + formData.leaveSubTypeName
-                      ? formData.leaveSubTypeName
-                      : formData.leaveTypeName,
+                    'ยกเลิก' +
+                      (formData.leaveSubTypeName
+                        ? formData.leaveSubTypeName
+                        : formData.leaveTypeName),
                     typeDocx
                   )
                 "
@@ -522,9 +523,10 @@ onMounted(async () => {
                 @click="
                   onClickDownloadFile(
                     formData.id,
-                    'ยกเลิก' + formData.leaveSubTypeName
-                      ? formData.leaveSubTypeName
-                      : formData.leaveTypeName,
+                    'ยกเลิก' +
+                      (formData.leaveSubTypeName
+                        ? formData.leaveSubTypeName
+                        : formData.leaveTypeName),
                     typePdf
                   )
                 "