Merge branch 'develop' into dev

src/modules/04_registryPerson/components/detail/PersonalInformation/01_Profile.vue

@@ -589,10 +589,11 @@ onMounted(() => {
                 option-label="name"
                 option-value="name"
                 v-model="formData.prefix"
+                clearable
                 class="inputgreen"
                 :options="store.Ops.prefixOps"
                 :label="dataLabel.prefix"
-                :rules="[(val: string) => !!val || `${'กรุณาเลือก คำนำหน้าชื่อ'}`]"
+                :rules="[(val: string) => !!formData.rank || !!formData.prefix || `${'กรุณาเลือกคำนำหน้าชื่อ หรือยศ'}`]"
                 @filter="(inputValue: string,
               doneFn: Function) => filterSelector(inputValue, doneFn, 'prefixOps'
               )"
@@ -613,6 +614,7 @@ onMounted(() => {
                 input-debounce="0"
                 option-label="name"
                 option-value="name"
+                :rules="[(val: string) => !!formData.rank || !!formData.prefix || `${'กรุณาเลือกคำนำหน้าชื่อ หรือยศ'}`]"
                 v-model="formData.rank"
                 class="inputgreen"
                 :options="store.Ops.rankOps"

src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue

@@ -553,7 +553,6 @@ onMounted(async () => {
           </q-form>
 
           <div class="col-12">
-            {{ typeEmp }}
             <!-- v-if="typeEmp != 'employee'" -->
             <Workflow
               v-model:is-check-data="isCheckData"

src/modules/04_registryPerson/views/detailView.vue

@@ -22,6 +22,7 @@ import type {
   DataOptionSys,
 } from "@/modules/04_registryPerson/interface/index/Main";
 import type { ResponseObject } from "@/modules/04_registryPerson/interface/response/Profile";
+import { s } from "@fullcalendar/core/internal-common";
 
 /** importComponents*/
 const CardNotPermission = defineAsyncComponent(
@@ -178,6 +179,9 @@ function imageActive(n: any) {
  * @param file ไฟล์รูป
  */
 function resizeImage(file: File): Promise<File> {
+  if (!file) {
+    return Promise.reject("No file provided");
+  }
   return new Promise((resolve, reject) => {
     const img = new Image();
     const reader = new FileReader();
@@ -240,9 +244,9 @@ const newProfileFile = ref<any>(null);
 
 /** ฟังก์ชันอัปโหลด*/
 async function uploadImg() {
-  showLoader();
   newProfileFile.value = await resizeImage(profileFile.value);
   closeImage();
+  showLoader();
   await http
     .post(config.API.orgProfileAvatarbyType(empType.value), {
       profileId: empType.value == "" ? profileId.value : undefined,