Merge branch 'devA' into develop

src/modules/05_placement/components/AppointMent/Detail.vue

@@ -32,7 +32,7 @@ const title = ref<ResponseTitle>({
   positionTypeOld: "",
 });
 const appointment = ref<any>([]);
-
+const myform = ref<any>();
 const edit = ref<boolean>(false);
 const profileId = ref<string>("");
 const organizationPositionOld = ref<string>("");
@@ -83,8 +83,14 @@ const fecthappointmentByid = async () => {
       hideLoader();
     });
 };
-const clickSave = () => {
+const clickSave = async () => {
-  dialogConfirm($q, () => putAppointment());
+  console.log(reason.value);
+  await myform.value.validate().then(async (success: boolean) => {
+    if (success) {
+      dialogConfirm($q, () => putAppointment());
+    } else {
+    }
+  });
 };
 const putAppointment = async () => {
   console.log("บันทึกข้อมูล");
@@ -242,7 +248,7 @@ const getClass = (val: boolean) => {
       </div>
     </div>
     <div class="col-12"><q-separator /></div>
-    <q-form ref="myForm">
+    <q-form ref="myform">
       <div class="row col-12 q-pa-md">
         <div class="col-12">
           <div class="text-weight-bold text-grey">วุฒิการศึกษา</div>
@@ -289,7 +295,7 @@ const getClass = (val: boolean) => {
             </div>
           </div>
 
-          <div class="col-xs-6 col-sm-3 row ">
+          <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -305,7 +311,7 @@ const getClass = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row ">
+          <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -321,7 +327,7 @@ const getClass = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row ">
+          <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -337,7 +343,7 @@ const getClass = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row ">
+          <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
               <!-- <q-input :class="getClass(edit)" :outlined="edit" dense lazy-rules :readonly="!edit" :borderless="!edit"
                 v-model="salary" :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]" hide-bottom-space
@@ -345,6 +351,7 @@ const getClass = (val: boolean) => {
               <CurrencyInput
                 v-model="salary"
                 :edit="edit"
+                :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
                 :options="{
                   currency: 'THB',
                 }"

src/modules/05_placement/components/Other/Detail.vue

@@ -54,6 +54,7 @@ const responseData = ref<ResponseDataDetail>({
 const edit = ref<boolean>(false);
 const organizationPositionOld = ref<string>("");
 const positionTypeOld = ref<string>("");
+const myform = ref<any>();
 const positionLevelOld = ref<string>("");
 const posNo = ref<string>("");
 const salary = ref<number>(0);
@@ -123,8 +124,13 @@ const fecthOther = async () => {
       edit.value = false;
     });
 };
-const clickEdit = () => {
+const clickEdit = async () => {
-  dialogConfirm($q, () => saveOther());
+  await myform.value.validate().then(async (success: boolean) => {
+    if (success) {
+      dialogConfirm($q, () => saveOther());
+    } else {
+    }
+  });
 };
 const saveOther = async () => {
   // showLoader();
@@ -201,7 +207,7 @@ const getClass = (val: boolean) => {
           <q-img :src="avatar" v-if="avatar !== ''" />
           <q-img src="@/assets/avatar_user.jpg" v-else />
         </div>
-        <div class="col-xs-6 col-sm-3 row ">
+        <div class="col-xs-6 col-sm-3 row">
           <div class="col-12 q-pl-md">
             <div class="col-12 text-top">ตำแหน่งในสายงาน</div>
             <div class="col-12 text-detail">
@@ -209,7 +215,7 @@ const getClass = (val: boolean) => {
             </div>
           </div>
         </div>
-        <div class="col-xs-6 col-sm-3 row ">
+        <div class="col-xs-6 col-sm-3 row">
           <div class="col-12">
             <div class="col-12 text-top">ระดับ</div>
             <div class="col-12 text-detail">
@@ -275,7 +281,7 @@ const getClass = (val: boolean) => {
       </div>
     </div>
     <div class="col-12"><q-separator /></div>
-    <q-form ref="myForm">
+    <q-form ref="myform">
       <div class="row col-12 q-pa-md">
         <div class="col-12 row bg-white q-col-gutter-md">
           <div class="col-xs-12 row items-center">
@@ -300,7 +306,7 @@ const getClass = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row ">
+          <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -316,7 +322,7 @@ const getClass = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row ">
+          <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -332,7 +338,7 @@ const getClass = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row ">
+          <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
               <q-input
                 :class="getClass(edit)"
@@ -348,7 +354,7 @@ const getClass = (val: boolean) => {
               />
             </div>
           </div>
-          <div class="col-xs-6 col-sm-3 row ">
+          <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
               <!-- <q-input
                 :class="getClass(edit)"

src/modules/05_placement/components/Transfer/transferRegistry.vue

@@ -347,62 +347,61 @@
             <div class="col-12">
               <div class="row q-col-gutter-x-xs">
                 <div class="col-xs-6 col-sm-6">
-                    <q-input
+                  <q-input
-                      :class="getClass(edit)"
+                    :class="getClass(edit)"
-                      :outlined="edit"
+                    :outlined="edit"
-                      dense
+                    dense
-                      lazy-rules
+                    lazy-rules
-                      :readonly="!edit"
+                    :readonly="!edit"
-                      :borderless="!edit"
+                    :borderless="!edit"
-                      v-model="organization"
+                    v-model="organization"
-                      :rules="[(val) => !!val || `${'กรุณากรอกโอนไปสังกัด'}`]"
+                    :rules="[(val) => !!val || `${'กรุณากรอกโอนไปสังกัด'}`]"
-                      hide-bottom-space
+                    hide-bottom-space
-                      :label="`${'โอนไปสังกัด'}`"
+                    :label="`${'โอนไปสังกัด'}`"
-                    />
+                  />
                 </div>
                 <div class="col-xs-6 col-sm-6">
-                    <datepicker
+                  <datepicker
-                      menu-class-name="modalfix"
+                    menu-class-name="modalfix"
-                      :readonly="!edit"
+                    :readonly="!edit"
-                      v-model="date"
+                    v-model="date"
-                      :locale="'th'"
+                    :locale="'th'"
-                      autoApply
+                    autoApply
-                      :enableTimePicker="false"
+                    :enableTimePicker="false"
-                      week-start="0"
+                    week-start="0"
-                    >
+                  >
-                      <template #year="{ year }">{{ year + 543 }}</template>
+                    <template #year="{ year }">{{ year + 543 }}</template>
-                      <template #year-overlay-value="{ value }">{{
+                    <template #year-overlay-value="{ value }">{{
-                        parseInt(value + 543)
+                      parseInt(value + 543)
-                      }}</template>
+                    }}</template>
-                      <template #trigger>
+                    <template #trigger>
-                        <q-input
+                      <q-input
-                          :class="getClass(edit)"
+                        :class="getClass(edit)"
-                          :outlined="edit"
+                        :outlined="edit"
-                          dense
+                        dense
-                          lazy-rules
+                        lazy-rules
-                          :borderless="!edit"
+                        :borderless="!edit"
-                          :model-value="date !== null ? date2Thai(date) : null"
+                        :readonly="!edit"
-                          :rules="[
+                        :model-value="date !== null ? date2Thai(date) : null"
-                            (val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`,
+                        :rules="[(val) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]"
-                          ]"
+                        hide-bottom-space
-                          hide-bottom-space
+                        :label="`${'ตั้งแต่วัน'}`"
-                          :label="`${'ตั้งแต่วัน'}`"
+                      >
-                        >
+                        <template v-slot:prepend>
-                          <template v-slot:prepend>
+                          <q-icon
-                            <q-icon
+                            name="event"
-                              name="event"
+                            class="cursor-pointer"
-                              class="cursor-pointer"
+                            :style="
-                              :style="
+                              edit
-                                edit
+                                ? 'color: var(--q-primary)'
-                                  ? 'color: var(--q-primary)'
+                                : 'color: var(--q-grey)'
-                                  : 'color: var(--q-grey)'
+                            "
-                              "
+                          >
-                            >
+                          </q-icon>
-                            </q-icon>
+                        </template>
-                          </template>
+                      </q-input>
-                        </q-input>
+                    </template>
-                      </template>
+                  </datepicker>
-                    </datepicker>
                 </div>
               </div>
             </div>