Merge branch 'develop' into dev

src/modules/05_placement/components/PersonalDetail/Information/Qualification.vue

@@ -53,6 +53,7 @@ const saveData = async () => {
         changeBtn();
         onEdit.value = false;
         edit.value = false;
+        emit("update:statusEdit", false);
       })
       .catch((e: any) => {
         messageError($q, e);

src/modules/05_placement/components/PersonalDetail/Information/top.vue

@@ -1,7 +1,7 @@
 <!-- ส่วนหัวของ ข้อมูลส่วนตัว และ ที่อยู่ -->
 <script setup lang="ts">
 import { checkPermission } from "@/utils/permissions";
-import { ref } from "vue";
+import { computed } from "vue";
 import { useRoute } from "vue-router";
 
 const route = useRoute();
@@ -62,9 +62,9 @@ const props = defineProps({
 });
 
 const emit = defineEmits(["update:edit"]);
-const isEdit = ref<boolean>(
+const isEdit = computed(() => {
-  checkPermission(route)?.attrIsUpdate ? true : false
+  return checkPermission(route)?.attrIsUpdate ? true : false;
-);
+});
 
 const updateEdit = (value: any) => {
   emit("update:edit", value);

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

@@ -771,6 +771,7 @@ onMounted(async () => {
         <q-space />
         <div
           v-if="
+          !checkRoutePermisson &&
             isStaff &&
             status === 'WAITTING' &&
             checkPermission($route)?.attrIsUpdate

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

@@ -36,7 +36,7 @@ const {
   dialogConfirm,
 } = useCounterMixin();
 
-const checkRoutePermisson = ref<boolean>(route.name == "resignDetailReject");
+const checkRoutePermisson = ref<boolean>(route.name == "resignDetailreject");
 
 /** ตัวแปร */
 const roleUser = ref<string>("");
@@ -439,7 +439,7 @@ onMounted(async () => {
         class="q-mr-sm"
         @click="router.push('/retirement/resign')"
       />
-      รายละเอียดการยกเลิกลาออก
+      รายละเอียดการยกเลิกลาออก {{ route.name }}
       {{
         dataDetail.prefix + dataDetail.firstName + "  " + dataDetail.lastName
       }}

src/modules/06_retirement/components/03_resignEmp/ResignByid.vue

@@ -801,6 +801,7 @@ onMounted(async () => {
         <q-space />
         <div
           v-if="
+          !checkRoutePermisson &&
             isStaff &&
             status === 'WAITTING' &&
             checkPermission($route)?.attrIsUpdate

src/modules/06_retirement/components/03_resignEmp/ResignReject.vue

@@ -29,7 +29,7 @@ const router = useRouter();
 const store = useRetirementDataStore();
 const { fetchDataCheckIsoffice } = useRoleWorkflowDataStore();
 const { convertStatusText } = store;
-const checkRoutePermisson = ref<boolean>(route.name == "resignDetailRejectEMP");
+const checkRoutePermisson = ref<boolean>(route.name == "resignDetailrejectEMP");
 const mixin = useCounterMixin();
 const {
   messageError,