Merge branch 'develop' into dev

src/modules/01_exam/components/ExamForm.vue

@@ -10,6 +10,7 @@
         v-model:formOccupation="formOccupation"
         v-model:formEducation="formEducation"
         v-model:formContact="formContact"
+        :positionLevel="positionLevel"
       />
       <!-- v-model:formFamily="formFamily" -->
       <div v-html="editorConfirm"></div>

src/modules/01_exam/components/Form/Education.vue

@@ -9,10 +9,10 @@
     :editData="false"
     :required="true"
   />
-
+  {{ positionLevel }}
   <div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-xs">
     <div class="col-12 row q-col-gutter-sm">
-      <div class="col-xs-12 col-sm-3">
+      <div class="col-xs-12 col-sm-3" v-if="positionLevel !== 'ปฏิบัติงาน'">
         <q-select
           :class="getClass(isStatusRegister)"
           :readonly="!isStatusRegister"
@@ -45,7 +45,7 @@
           :label="`${'ชื่อปริญญา'}`"
         />
       </div>
-      <div class="col-xs-12 col-sm-3">
+      <div class="col-xs-12 col-sm-3" v-if="positionLevel !== 'ปฏิบัติงาน'">
         <q-input
           :class="getClass(isStatusRegister)"
           :outlined="isStatusRegister"
@@ -210,6 +210,10 @@ const props = defineProps({
   isStatusRegister: {
     type: Boolean,
     required: true
+  },
+  positionLevel: {
+    type: String,
+    required: false
   }
 })
 

src/modules/01_exam/components/Form/Profile.vue

@@ -20,6 +20,7 @@
   <q-separator class="q-my-lg bg-gray" size="5px" />
   <div class="q-px-sm">
     <Education
+      :positionLevel="positionLevel"
       :status="status"
       :isStatusRegister="isStatusRegister"
       v-model:form="formEducation"
@@ -115,6 +116,10 @@ const props = defineProps({
   isStatusRegister: {
     type: Boolean,
     required: true
+  },
+  positionLevel: {
+    type: String,
+    required: false
   }
 })
 const emit = defineEmits([