From f07f3acd5122a14cfd2398154eac20b499cf8c73 Mon Sep 17 00:00:00 2001
From: oat_dev <nattapon@frappet.com>
Date: Fri, 29 Mar 2024 17:08:52 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4:=20clearable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/Achievement/01_ProfessionalLicense.vue      |  8 ++++++--
 .../components/detail/Achievement/02_Train.vue         | 10 ++++++----
 .../detail/PersonalInformation/04_Family.vue           |  4 ----
 .../detail/PersonalInformation/05_Education.vue        |  2 --
 .../04_registryNew/interface/request/ProfesLicense.ts  |  2 +-
 .../04_registryNew/interface/request/Training.ts       |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
index 2195d1b9d..c7d10d1c8 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue
@@ -9,6 +9,7 @@ import type { RequestItemsObject } from "@/modules/04_registryNew/interface/requ
 import type { ResponseObject } from "@/modules/04_registryNew/interface/response/ProfesLicense";
 import http from "@/plugins/http";
 import config from "@/app.config";
+import { log } from "console";
 const mixin = useCounterMixin();
 const $q = useQuasar();
 const {
@@ -179,7 +180,7 @@ const profesLicenseData = reactive<RequestItemsObject>({
   issuer: "",
   certificateNo: "",
   issueDate: new Date(),
-  expireDate: new Date(),
+  expireDate: null,
   profileId: id.value,
 });
 
@@ -244,7 +245,7 @@ async function fetchData(id: string) {
 }
 
 function clearForm() {
-  profesLicenseData.expireDate = new Date();
+  profesLicenseData.expireDate = null;
   profesLicenseData.issueDate = new Date();
   profesLicenseData.certificateNo = "";
   profesLicenseData.certificateType = "";
@@ -642,6 +643,8 @@ onMounted(async () => {
                   dense
                   outlined
                   bg-color="white"
+                  clearable
+                  @clear="() => (profesLicenseData.expireDate = null)"
                   hide-bottom-space
                   :model-value="
                     profesLicenseData.expireDate
@@ -649,6 +652,7 @@ onMounted(async () => {
                       : ''
                   "
                   :label="`${'วันที่หมดอายุ'}`"
+                  @update:modelValue="profesLicenseData.expireDate"
                 >
                   <template v-slot:prepend>
                     <q-icon
diff --git a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
index d2aaba5f0..5e031a364 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
@@ -295,12 +295,12 @@ const trainData = reactive<RequestItemsObject>({
   profileId: id.value,
   name: "",
   topic: "",
-  yearly: new Date().getFullYear(),
+  yearly: null,
   place: "",
   duration: "",
   department: "",
   numberOrder: "",
-  dateOrder: new Date(),
+  dateOrder: null,
   startDate: new Date(),
   endDate: new Date(),
   startYear: new Date().getFullYear(),
@@ -360,7 +360,7 @@ function clearForm() {
   isDate.value = "false";
   trainData.name = "";
   trainData.topic = "";
-  trainData.yearly = new Date().getFullYear();
+  trainData.yearly = null;
   trainData.place = "";
   trainData.duration = "";
   trainData.department = "";
@@ -959,7 +959,9 @@ onMounted(async () => {
                     lazy-rules
                     outlined
                     hide-bottom-space
-                    :model-value="trainData.yearly + 543"
+                    :model-value="
+                      !!trainData.yearly ? trainData.yearly + 543 : null
+                    "
                     :label="`${'ปีงบประมาณ'}`"
                   >
                     <template v-slot:prepend>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
index 7bd548b97..6954b5d26 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/04_Family.vue
@@ -520,7 +520,6 @@ onMounted(async () => {
                   label="คำนำหน้าชื่อ"
                   v-model="fatherData.prefix"
                   use-input
-                  clearable
                   input-debounce="0"
                   emit-value
                   map-options
@@ -649,7 +648,6 @@ onMounted(async () => {
                   label="คำนำหน้าชื่อ"
                   hidden-space
                   use-input
-                  clearable
                   input-debounce="0"
                   emit-value
                   map-options
@@ -778,7 +776,6 @@ onMounted(async () => {
                   label="คำนำหน้าชื่อ"
                   hidden-space
                   use-input
-                  clearable
                   input-debounce="0"
                   emit-value
                   map-options
@@ -899,7 +896,6 @@ onMounted(async () => {
                       :rules="[(val) => !!val || 'กรุณาเลือกคำนำหน้าชื่อ']"
                       label="คำนำหน้าชื่อ"
                       use-input
-                      clearable
                       input-debounce="0"
                       emit-value
                       map-options
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
index 581588854..f4187fa96 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
@@ -977,7 +977,6 @@ onMounted(async () => {
                       ) "
                 :rules="[(val) => !!val || `${'กรุณาเลือกระดับการศึกษา'}`]"
                 label="ระดับการศึกษา"
-                clearable
               />
             </div>
             <div class="col-6">
@@ -1237,7 +1236,6 @@ onMounted(async () => {
                 dense
                 emit-value
                 map-options
-                clearable
                 bg-color="white"
                 v-model="educationData.isEducation"
                 :options="educationOption"
diff --git a/src/modules/04_registryNew/interface/request/ProfesLicense.ts b/src/modules/04_registryNew/interface/request/ProfesLicense.ts
index 5a005de57..ef77223be 100644
--- a/src/modules/04_registryNew/interface/request/ProfesLicense.ts
+++ b/src/modules/04_registryNew/interface/request/ProfesLicense.ts
@@ -3,7 +3,7 @@ interface RequestItemsObject {
     issuer: string;
     certificateNo: string;
     issueDate: Date;
-    expireDate: Date;
+    expireDate: Date | null;
     profileId: string;
 }
 
diff --git a/src/modules/04_registryNew/interface/request/Training.ts b/src/modules/04_registryNew/interface/request/Training.ts
index c5bc11761..8d88a6bcb 100644
--- a/src/modules/04_registryNew/interface/request/Training.ts
+++ b/src/modules/04_registryNew/interface/request/Training.ts
@@ -1,12 +1,12 @@
 interface RequestItemsObject {
     name: string,
     topic: string,
-    yearly: number,
+    yearly: number | null,
     place: string,
     duration: string,
     department: string,
     numberOrder: string,
-    dateOrder: Date,
+    dateOrder: Date | null,
     startDate: Date,
     endDate: Date,
     startYear: number,