From 477b8e999cee9937f2d0263dc7fb96caeb20e118 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Wed, 13 Sep 2023 17:03:17 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B9=80=E0=B8=81=E0=B9=89=20validate?=
 =?UTF-8?q?=20=E0=B9=80=E0=B9=80=E0=B8=A5=E0=B9=89=E0=B8=A7=20input=20?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=AD=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/1_Proposals/addProposals.vue   | 24 +++++++++++--------
 .../components/3_result/DialogForm.vue        |  2 +-
 .../components/4_Allocate/DialogForm.vue      | 23 ++++++++++++++----
 .../08_registryEmployee/views/Assessment.vue  |  2 +-
 .../08_registryEmployee/views/Discipline.vue  |  2 +-
 .../08_registryEmployee/views/Education.vue   |  2 +-
 .../views/Information/Address.vue             |  2 +-
 .../views/Information/Certicate.vue           |  2 +-
 .../views/Information/Family.vue              |  2 +-
 .../views/Information/Information.vue         |  2 +-
 .../views/Information/Tempinformation.vue     |  2 +-
 .../08_registryEmployee/views/Leave.vue       |  2 +-
 .../08_registryEmployee/views/Other.vue       |  2 +-
 .../08_registryEmployee/views/Talent.vue      |  2 +-
 .../08_registryEmployee/views/Train.vue       |  2 +-
 .../08_registryEmployee/views/Work.vue        |  2 +-
 .../10_order/components/step/step02.vue       |  2 +-
 17 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/src/modules/07_insignia/components/1_Proposals/addProposals.vue b/src/modules/07_insignia/components/1_Proposals/addProposals.vue
index 0375d325a..23ebbdd74 100644
--- a/src/modules/07_insignia/components/1_Proposals/addProposals.vue
+++ b/src/modules/07_insignia/components/1_Proposals/addProposals.vue
@@ -15,6 +15,7 @@ const {
   hideLoader,
   dialogConfirm,
   success,
+  dialogMessageNotify
 } = mixin;
 const router = useRouter();
 const route = useRoute();
@@ -106,22 +107,25 @@ const editData = async (id: string) => {
   console.log(formData);
 };
 const checkSave = () => {
-  dialogConfirm($q, () => SaveData());
-};
-const SaveData = async () => {
   if (myForm.value !== null) {
     myForm.value.validate().then(async (success) => {
       if (success) {
-        if (edit.value) {
-          await editData(id.value);
-        } else {
-          await addData();
-          clickBack();
-        }
+        dialogConfirm($q, () => SaveData());
+      }else {
+        dialogMessageNotify($q,"กรุณาเลือกรอบการเสนอขอพระราชทานเครื่องราชฯ")
       }
-    });
+    })
   }
 };
+const SaveData = async () => {
+  if (edit.value) {
+    await editData(id.value);
+  } else {
+    await addData();
+    clickBack();
+  }
+};
+
 const updateDateRange = () => {
   if (roundInsig.value.value == 1) {
     dateStart.value = new Date(new Date().getFullYear(), 9, 1);
diff --git a/src/modules/07_insignia/components/3_result/DialogForm.vue b/src/modules/07_insignia/components/3_result/DialogForm.vue
index e5b50659c..2b847d30c 100644
--- a/src/modules/07_insignia/components/3_result/DialogForm.vue
+++ b/src/modules/07_insignia/components/3_result/DialogForm.vue
@@ -278,7 +278,7 @@ const searchcardid = () => {
       <q-form ref="myForm">
         <div class="q-pa-md">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-4">
               <q-select
diff --git a/src/modules/07_insignia/components/4_Allocate/DialogForm.vue b/src/modules/07_insignia/components/4_Allocate/DialogForm.vue
index f5a54922e..a222c1fec 100644
--- a/src/modules/07_insignia/components/4_Allocate/DialogForm.vue
+++ b/src/modules/07_insignia/components/4_Allocate/DialogForm.vue
@@ -5,9 +5,9 @@ import { useCounterMixin } from "@/stores/mixin";
 
 import { useRouter } from "vue-router";
 const $q = useQuasar();
-const myForm = ref<QForm>();
+const myForm = ref<QForm | null>(null); //form data input
 const mixin = useCounterMixin();
-const { dialogConfirm } = mixin;
+const { dialogConfirm,dialogMessageNotify } = mixin;
 const router = useRouter();
 const routeName = router.currentRoute.value.name;
 const amount = ref<number | null>();
@@ -42,8 +42,18 @@ watch(props, () => {
 });
 
 const clickSave = () => {
-  dialogConfirm($q, () => props.save(grandCross.value, amount.value));
+  if (myForm.value !== null) {
+    myForm.value.validate().then(async (success) => {
+      if (success) {
+        dialogConfirm($q, () => props.save(grandCross.value, amount.value));
+      }else {
+        dialogMessageNotify($q,"กรุณาข้อมูลให้ครบ")
+      }
+    })
+  }
 };
+
+
 </script>
 
 <template>
@@ -65,7 +75,7 @@ const clickSave = () => {
       <q-form ref="myForm">
         <div class="q-pa-md">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-6">
               <q-select
@@ -79,6 +89,7 @@ const clickSave = () => {
                 map-options
                 outlined
                 options-cover
+                :rules="[(val) => !!val || `${'กรุณากรอกจำนวน'}`,]"
                 v-model="grandCross"
                 :label="
                   routeName == 'insigniaAllocate'
@@ -86,6 +97,7 @@ const clickSave = () => {
                     : `เลือกหน่วยงาน`
                 "
               />
+
             </div>
             <div class="col-xs-12 col-sm-6">
               <q-input
@@ -97,6 +109,7 @@ const clickSave = () => {
                 lazy-rules
                 type="number"
                 label="จำนวน"
+                :rules="[(val) => !!val || `${'กรุณากรอกจำนวน'}`,]"
               />
               <!-- :rules="[(val:any) =>val.length != 13 ||`${'กรุณากรอกเลขบัตรประจำตัวประชาชนให้ครบ'}`,]" -->
             </div>
@@ -107,7 +120,7 @@ const clickSave = () => {
       <q-separator />
       <div class="row justify-end q-py-sm">
         <div class="q-px-md">
-          <q-btn label="บันทึก" @click="clickSave" color="public" />
+          <q-btn label="บันทึก" @click="clickSave" color="public" :disable="grandCross == '' || amount == null || amount == 0" />
         </div>
       </div>
     </q-card>
diff --git a/src/modules/08_registryEmployee/views/Assessment.vue b/src/modules/08_registryEmployee/views/Assessment.vue
index 2ff696e02..2138234a4 100644
--- a/src/modules/08_registryEmployee/views/Assessment.vue
+++ b/src/modules/08_registryEmployee/views/Assessment.vue
@@ -61,7 +61,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-12 col-sm-12 col-md-12">
               <datepicker
diff --git a/src/modules/08_registryEmployee/views/Discipline.vue b/src/modules/08_registryEmployee/views/Discipline.vue
index d7a66f07a..8a3b73abc 100644
--- a/src/modules/08_registryEmployee/views/Discipline.vue
+++ b/src/modules/08_registryEmployee/views/Discipline.vue
@@ -57,7 +57,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
diff --git a/src/modules/08_registryEmployee/views/Education.vue b/src/modules/08_registryEmployee/views/Education.vue
index 794af7613..422e5b65a 100644
--- a/src/modules/08_registryEmployee/views/Education.vue
+++ b/src/modules/08_registryEmployee/views/Education.vue
@@ -71,7 +71,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <selector
diff --git a/src/modules/08_registryEmployee/views/Information/Address.vue b/src/modules/08_registryEmployee/views/Information/Address.vue
index fe29239b4..849102d3e 100644
--- a/src/modules/08_registryEmployee/views/Information/Address.vue
+++ b/src/modules/08_registryEmployee/views/Information/Address.vue
@@ -13,7 +13,7 @@
       :addEmployee="statusAdd()"
     />
     <q-form ref="myform">
-      <div class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs">
+      <div class="row col-12  q-col-gutter-x-xs q-col-gutter-y-xs">
         <div class="col-xs-12">
           <q-input
             :class="getClass(edit)"
diff --git a/src/modules/08_registryEmployee/views/Information/Certicate.vue b/src/modules/08_registryEmployee/views/Information/Certicate.vue
index 857977ac8..aad106778 100644
--- a/src/modules/08_registryEmployee/views/Information/Certicate.vue
+++ b/src/modules/08_registryEmployee/views/Information/Certicate.vue
@@ -68,7 +68,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12  q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
diff --git a/src/modules/08_registryEmployee/views/Information/Family.vue b/src/modules/08_registryEmployee/views/Information/Family.vue
index edda7a750..1713778ab 100644
--- a/src/modules/08_registryEmployee/views/Information/Family.vue
+++ b/src/modules/08_registryEmployee/views/Information/Family.vue
@@ -13,7 +13,7 @@
       :addEmployee="statusAdd()"
     />
     <q-form ref="myform" class="col-12">
-      <div class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs">
+      <div class="row col-12  q-col-gutter-x-xs q-col-gutter-y-xs">
         <div class="col-12 row q-pb-sm q-pt-md">
           <div class="col-xs-2 col-sm-1 text-weight-bold">• บิดา</div>
           <div class="q-gutter-sm">
diff --git a/src/modules/08_registryEmployee/views/Information/Information.vue b/src/modules/08_registryEmployee/views/Information/Information.vue
index 795814635..42718f1e8 100644
--- a/src/modules/08_registryEmployee/views/Information/Information.vue
+++ b/src/modules/08_registryEmployee/views/Information/Information.vue
@@ -13,7 +13,7 @@
       :addEmployee="statusAdd()"
     />
     <q-form ref="myform" class="col-12">
-      <div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-sm">
+      <div class="row col-12  q-col-gutter-x-sm q-col-gutter-y-sm">
         <div class="col-xs-6 col-sm-3 col-md-3">
           <q-input
             :class="getClass(edit)"
diff --git a/src/modules/08_registryEmployee/views/Information/Tempinformation.vue b/src/modules/08_registryEmployee/views/Information/Tempinformation.vue
index e060d1ec4..0f1287a68 100644
--- a/src/modules/08_registryEmployee/views/Information/Tempinformation.vue
+++ b/src/modules/08_registryEmployee/views/Information/Tempinformation.vue
@@ -12,7 +12,7 @@
       :history="!statusAdd()"
     />
     <q-form ref="myform">
-      <div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-sm">
+      <div class="row col-12  q-col-gutter-x-sm q-col-gutter-y-sm">
         <div class="col-xs-6 col-sm-3 col-md-3">
           <selector
             :class="getClass(edit)"
diff --git a/src/modules/08_registryEmployee/views/Leave.vue b/src/modules/08_registryEmployee/views/Leave.vue
index 6608958f3..b26655003 100644
--- a/src/modules/08_registryEmployee/views/Leave.vue
+++ b/src/modules/08_registryEmployee/views/Leave.vue
@@ -81,7 +81,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <selector
diff --git a/src/modules/08_registryEmployee/views/Other.vue b/src/modules/08_registryEmployee/views/Other.vue
index 977265bec..1384c0696 100644
--- a/src/modules/08_registryEmployee/views/Other.vue
+++ b/src/modules/08_registryEmployee/views/Other.vue
@@ -54,7 +54,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
diff --git a/src/modules/08_registryEmployee/views/Talent.vue b/src/modules/08_registryEmployee/views/Talent.vue
index a3d4d6b4a..b1842ab4b 100644
--- a/src/modules/08_registryEmployee/views/Talent.vue
+++ b/src/modules/08_registryEmployee/views/Talent.vue
@@ -51,7 +51,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-6">
               <q-input
diff --git a/src/modules/08_registryEmployee/views/Train.vue b/src/modules/08_registryEmployee/views/Train.vue
index d06149fde..3c90eb592 100644
--- a/src/modules/08_registryEmployee/views/Train.vue
+++ b/src/modules/08_registryEmployee/views/Train.vue
@@ -64,7 +64,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <q-input
diff --git a/src/modules/08_registryEmployee/views/Work.vue b/src/modules/08_registryEmployee/views/Work.vue
index 91e579e91..99317723d 100644
--- a/src/modules/08_registryEmployee/views/Work.vue
+++ b/src/modules/08_registryEmployee/views/Work.vue
@@ -61,7 +61,7 @@
         <q-separator />
         <q-card-section class="q-p-sm">
           <div
-            class="row col-12 items-center q-col-gutter-x-xs q-col-gutter-y-xs"
+            class="row col-12 q-col-gutter-x-xs q-col-gutter-y-xs"
           >
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
diff --git a/src/modules/10_order/components/step/step02.vue b/src/modules/10_order/components/step/step02.vue
index 496544e2c..09c0ea800 100644
--- a/src/modules/10_order/components/step/step02.vue
+++ b/src/modules/10_order/components/step/step02.vue
@@ -617,7 +617,7 @@ const getClass = (val: boolean) => {
         <q-card-section class="q-pa-sm bg-grey-1">
           <div class="row col-12 q-col-gutter-sm">
             <div class="col-xs-12">
-              <div class="col-12 row q-py-sm items-center q-col-gutter-sm">
+              <div class="col-12 row q-py-sm q-col-gutter-sm">
                 <div class="col-xs-6 col-sm-6 col-md-6">
                   <CurruncyInput
                     :edit="true"