Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop

# Conflicts:
#	src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue

src/modules/13_salary/components/SalaryLists/DialogMoveLevel.vue

@@ -14,6 +14,7 @@ const store = useSalaryListSDataStore();
 const modal = defineModel<boolean>("modal", { required: true });
 const profileId = defineModel<string>("profileId", { required: true });
 const type = ref<string>("");
+const typeRef = ref<any>(null);
 const isReadonly = ref<boolean>(false); // อ่านได้อย่างเดียว
 const mixin = useCounterMixin();
 const { dialogConfirm, success, messageError, showLoader, hideLoader } = mixin;
@@ -26,7 +27,10 @@ const props = defineProps({
 
 /*** ฟังก์ชั่นสำหรับ validate ฟอร์ม */
 function validateForm() {
-  onSubmit();
+  typeRef.value.validate();
+  if (typeRef.value.validate()) {
+    onSubmit();
+  }
 }
 
 function close() {
@@ -74,7 +78,7 @@ function inputEdit(val: boolean) {
       <q-card-section class="scroll" style="max-height: 70vh">
         <div class="q-gutter-y-sm">
           <q-select
-            ref="periodRef"
+            ref="typeRef"
             :class="inputEdit(isReadonly)"
             v-model="type"
             label="เลื่อนขั้น"