From d1316ecb6a4cffe7ddafa582ed42d3983769b341 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 22 Oct 2024 16:47:22 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B2=20=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=87=E0=B8=84=E0=B8=B1=E0=B8=9A=20=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/org/api.org.ts                        |  1 +
 .../components/DialogAddRequestEdit.vue       | 24 ++++++++++++++-----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/api/org/api.org.ts b/src/api/org/api.org.ts
index b48affe..4aab276 100644
--- a/src/api/org/api.org.ts
+++ b/src/api/org/api.org.ts
@@ -82,6 +82,7 @@ export default {
    * รายการคำร้องขอแก้ไขข้อมูลทะเบียนประวัติ
    */
   requestEdit: `${profileOrg}/edit/`,
+  requestsEdit: `${profileOrg}/edit`,
   developmentUser: `${profileOrg}/development/user`,
 
   upDateNumber:`${profileOrg}/updatePhoneNumber/user`,
diff --git a/src/modules/10_registry/components/DialogAddRequestEdit.vue b/src/modules/10_registry/components/DialogAddRequestEdit.vue
index 349a580..117c048 100644
--- a/src/modules/10_registry/components/DialogAddRequestEdit.vue
+++ b/src/modules/10_registry/components/DialogAddRequestEdit.vue
@@ -50,16 +50,24 @@ function closeDialog() {
 function onSubmit() {
   dialogConfirm(
     $q,
-    () => {
+    async () => {
       showLoader();
-      http
-        .post(config.API.requestEdit, {
+      await http
+        .post(config.API.requestsEdit, {
           topic: formData.topic,
           detail: formData.detail,
           profileId: profileId.value,
         })
-        .then((res) => {
-          createURLUpload(res.data.result, formData.document);
+        .then(async (res) => {
+          if (formData.document) {
+            createURLUpload(res.data.result, formData.document);
+          } else {
+            formData.document = null;
+            await props.fetchData?.();
+            await success($q, "บันทึกข้อมูลสำเร็จ");
+            closeDialog();
+            hideLoader();
+          }
         })
         .catch((err) => {
           messageError($q, err);
@@ -253,7 +261,11 @@ watch(
                     : '.pdf,.xlsx,.docx'
                 "
                 hide-bottom-space
-                :rules="[(val:any) => !!val || `${'กรุณาเลือกไฟล์'}`]"
+                :rules="formData.topic !== 'ขอปรับปรุงข้อมูลจากกรมการปกครอง' && 
+                formData.topic !== 'ขอแก้ไขอาชีพ คู่สมรส' && 
+                formData.topic !== 'ขอแก้ไขอาชีพ บิดา' && 
+                formData.topic !== 'ขอแก้ไขอาชีพ มารดา' && 
+                formData.topic !== 'ขอแก้ไขที่อยู่ปัจจุบัน'?[(val:any) => !!val || `${'กรุณาเลือกไฟล์'}`]:''"
               />
             </div>
           </div>