From eeaffa58159f8ec5f9925a42b21cef7322ae448a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 14 Sep 2023 17:38:34 +0700
Subject: [PATCH] =?UTF-8?q?bug=20=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=AF?=
 =?UTF-8?q?>>=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=A5=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=99=E0=B8=AD=E0=B8=82=E0=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/3_result/DialogForm.vue        | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/modules/07_insignia/components/3_result/DialogForm.vue b/src/modules/07_insignia/components/3_result/DialogForm.vue
index 20d475b64..8ebd50182 100644
--- a/src/modules/07_insignia/components/3_result/DialogForm.vue
+++ b/src/modules/07_insignia/components/3_result/DialogForm.vue
@@ -180,24 +180,24 @@ const fectDataByid = async (id: string) => {
     .get(config.API.noteByid(id))
     .then((res) => {
       let data = res.data.result;
-      cardid.value = data.citizenId;
-      fullName.value = data.fullName;
-      position.value = data.position;
-      Advertise.value = data.number;
-      brand.value = data.requestInsigniaId;
-      receivedate.value = data.dateReceive;
-      issue.value = data.issue;
-      affiliationRequest.value = data.organizationOrganizationSend;
-      affiliationReceived.value = data.organizationOrganizationReceive;
-      announceDate.value = data.date;
-      volume.value = data.volumeNo;
-      episode.value = data.section;
-      duty.value = data.page;
-      announced.value = data.no;
-      invoiceDate.value = data.datePayment;
-      payment.value = data.typePayment;
-      addressPayment.value = data.address;
-      status.value = data.status;
+      cardid.value = data.citizenId ?? "";
+      fullName.value = data.fullName ?? "";
+      position.value = data.position ?? "";
+      Advertise.value = data.number ?? "";
+      brand.value = data.requestInsigniaId ?? "";
+      receivedate.value = data.dateReceive ?? "";
+      issue.value = data.issue ?? "";
+      affiliationRequest.value = data.organizationOrganizationSend ?? "";
+      affiliationReceived.value = data.organizationOrganizationReceive ?? "";
+      announceDate.value = data.date ?? "";
+      volume.value = data.volumeNo ?? "";
+      episode.value = data.section ?? "";
+      duty.value = data.page ?? "";
+      announced.value = data.no ?? "";
+      invoiceDate.value = data.datePayment ?? "";
+      payment.value = data.typePayment ?? "";
+      addressPayment.value = data.address ?? "";
+      status.value = data.status ?? "";
     })
     .catch((err) => {
       console.log(err);
@@ -362,6 +362,7 @@ const searchcardid = () => {
                 borderless
                 outlined
                 v-model="Advertise"
+                lazy-rules
                 label="หมายเลขประกาศนีย์บัตรกำกับเครื่องราชอิสริยาภรณ์"
               />
             </div>
@@ -441,6 +442,7 @@ const searchcardid = () => {
                 outlined
                 v-model="issue"
                 label="ทะเบียนฐานนันดร"
+                lazy-rules
               />
             </div>
             <div class="col-xs-12 col-sm-6">