From d8eef40faf9c71a8c1615a9c0d81907fe9a98097 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 3 Jul 2024 14:46:44 +0700
Subject: [PATCH] fix bug

---
 .../15_development/components/Target.vue      | 241 +++++++++---------
 .../15_development/views/Scholarship.vue      |   6 +-
 2 files changed, 131 insertions(+), 116 deletions(-)

diff --git a/src/modules/15_development/components/Target.vue b/src/modules/15_development/components/Target.vue
index 8d01b5644..7c1a10af0 100644
--- a/src/modules/15_development/components/Target.vue
+++ b/src/modules/15_development/components/Target.vue
@@ -29,7 +29,14 @@ const route = useRoute();
 const projectId = ref<string>(route.params.id.toLocaleString());
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { dialogRemove, showLoader, hideLoader, messageError, success } = mixin;
+const {
+  dialogRemove,
+  showLoader,
+  hideLoader,
+  messageError,
+  success,
+  dialogConfirm,
+} = mixin;
 const groupTargetData: any = reactive({
   targetData: [{}],
 });
@@ -269,123 +276,127 @@ function onClickOpenDialog(type: string, target: string) {
 }
 
 /** เพิ่ม/แก้ไขกลุ่มเป้าหมาย */
-async function onSubmitGroup() {
-  if (isTarget.value === "planned") {
-    await http
-      .put(
-        config.API.developmentMainTab(
-          isEdit.value ? "tab2_1_edit" : "tab2_1_add",
-          isEdit.value ? editId.value : projectId.value
-        ),
-        {
-          groupTarget: formGroupTarget.groupTarget,
-          groupTargetSub: formGroupTarget.groupTargetSub,
-          positions:
-            formGroupTarget.groupTarget !== "OUTSIDERS"
-              ? formGroupTarget.positions.map((v) => ({
-                  position: v.position ? v.position : "",
-                  posTypePlannedId: v.posTypeId ? v.posTypeId : "",
-                  posLevelPlannedId: v.posLevelId ? v.posLevelId : "",
-                }))
-              : [],
-          type:
-            formGroupTarget.groupTarget === "OUTSIDERS"
-              ? formGroupTarget.type
-              : "",
-          amount: formGroupTarget.amount,
-        }
-      )
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      });
-  } else {
-    await http
-      .put(
-        config.API.developmentMainTab(
-          isEdit.value ? "tab2_3_edit" : "tab2_3_add",
-          isEdit.value ? editId.value : projectId.value
-        ),
-        {
-          groupTarget: formGroupTarget.groupTarget,
-          groupTargetSub: formGroupTarget.groupTargetSub,
-          position: formGroupTarget.position,
-          posTypeActualId: formGroupTarget.posType,
-          posLevelActualId: formGroupTarget.posLevel,
-          type: formGroupTarget.type,
-          amount: formGroupTarget.amount,
-        }
-      )
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      });
-  }
-  setTimeout(() => {
-    fetchData(projectId.value);
-    onClickCloseDialog();
-  }, 100);
+function onSubmitGroup() {
+  dialogConfirm($q, async () => {
+    if (isTarget.value === "planned") {
+      await http
+        .put(
+          config.API.developmentMainTab(
+            isEdit.value ? "tab2_1_edit" : "tab2_1_add",
+            isEdit.value ? editId.value : projectId.value
+          ),
+          {
+            groupTarget: formGroupTarget.groupTarget,
+            groupTargetSub: formGroupTarget.groupTargetSub,
+            positions:
+              formGroupTarget.groupTarget !== "OUTSIDERS"
+                ? formGroupTarget.positions.map((v) => ({
+                    position: v.position ? v.position : "",
+                    posTypePlannedId: v.posTypeId ? v.posTypeId : "",
+                    posLevelPlannedId: v.posLevelId ? v.posLevelId : "",
+                  }))
+                : [],
+            type:
+              formGroupTarget.groupTarget === "OUTSIDERS"
+                ? formGroupTarget.type
+                : "",
+            amount: formGroupTarget.amount,
+          }
+        )
+        .then(() => {
+          success($q, "บันทึกข้อมูลสำเร็จ");
+        })
+        .catch((err) => {
+          messageError($q, err);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    } else {
+      await http
+        .put(
+          config.API.developmentMainTab(
+            isEdit.value ? "tab2_3_edit" : "tab2_3_add",
+            isEdit.value ? editId.value : projectId.value
+          ),
+          {
+            groupTarget: formGroupTarget.groupTarget,
+            groupTargetSub: formGroupTarget.groupTargetSub,
+            position: formGroupTarget.position,
+            posTypeActualId: formGroupTarget.posType,
+            posLevelActualId: formGroupTarget.posLevel,
+            type: formGroupTarget.type,
+            amount: formGroupTarget.amount,
+          }
+        )
+        .then(() => {
+          success($q, "บันทึกข้อมูลสำเร็จ");
+        })
+        .catch((err) => {
+          messageError($q, err);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    }
+    setTimeout(() => {
+      fetchData(projectId.value);
+      onClickCloseDialog();
+    }, 100);
+  });
 }
 
 /**  เพิ่มผู้เกี่ยวข้อง */
-async function onSubmitRelate() {
-  if (isTarget.value === "planned") {
-    await http
-      .put(
-        config.API.developmentMainTab(
-          isEdit.value ? "tab2_2_edit" : "tab2_2_add",
-          isEdit.value ? editId.value : projectId.value
-        ),
-        {
-          groupTarget: formGroupRelate.relate,
-          amount: formGroupRelate.amount,
-        }
-      )
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      });
-  } else {
-    await http
-      .put(
-        config.API.developmentMainTab(
-          isEdit.value ? "tab2_4_edit" : "tab2_4_add",
-          isEdit.value ? editId.value : projectId.value
-        ),
-        {
-          groupTarget: formGroupRelate.relate,
-          amount: formGroupRelate.amount,
-        }
-      )
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-      })
-      .catch((err) => {
-        messageError($q, err);
-      })
-      .finally(() => {
-        hideLoader();
-      });
-  }
-  setTimeout(() => {
-    fetchData(projectId.value);
-    onClickCloseDialog();
-  }, 100);
+function onSubmitRelate() {
+  dialogConfirm($q, async () => {
+    if (isTarget.value === "planned") {
+      await http
+        .put(
+          config.API.developmentMainTab(
+            isEdit.value ? "tab2_2_edit" : "tab2_2_add",
+            isEdit.value ? editId.value : projectId.value
+          ),
+          {
+            groupTarget: formGroupRelate.relate,
+            amount: formGroupRelate.amount,
+          }
+        )
+        .then(() => {
+          success($q, "บันทึกข้อมูลสำเร็จ");
+        })
+        .catch((err) => {
+          messageError($q, err);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    } else {
+      await http
+        .put(
+          config.API.developmentMainTab(
+            isEdit.value ? "tab2_4_edit" : "tab2_4_add",
+            isEdit.value ? editId.value : projectId.value
+          ),
+          {
+            groupTarget: formGroupRelate.relate,
+            amount: formGroupRelate.amount,
+          }
+        )
+        .then(() => {
+          success($q, "บันทึกข้อมูลสำเร็จ");
+        })
+        .catch((err) => {
+          messageError($q, err);
+        })
+        .finally(() => {
+          hideLoader();
+        });
+    }
+    setTimeout(() => {
+      fetchData(projectId.value);
+      onClickCloseDialog();
+    }, 100);
+  });
 }
 
 /** clear form */
diff --git a/src/modules/15_development/views/Scholarship.vue b/src/modules/15_development/views/Scholarship.vue
index 1886f754b..de08d05ec 100644
--- a/src/modules/15_development/views/Scholarship.vue
+++ b/src/modules/15_development/views/Scholarship.vue
@@ -270,7 +270,11 @@ onMounted(() => {
           label="เลือกประเภททุน"
           @update:model-value="fetchNewList"
           class="select_ellipsis"
-        />
+        >
+          <q-tooltip>{{
+            scholarshipTypeOp.find((e) => e.id === formQuery.type)?.name
+          }}</q-tooltip>
+        </q-select>
       </div>
 
       <q-btn