From 07b45ba3ab8e9dd1792a8556aa9c070126f7f5bb Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 20 Feb 2025 17:57:44 +0700 Subject: [PATCH] fixing return message error closed #877 --- src/stores/linkage.ts | 22 +++++++++++----------- src/stores/mixin.ts | 27 +++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/src/stores/linkage.ts b/src/stores/linkage.ts index f587acfbc..2b253357e 100644 --- a/src/stores/linkage.ts +++ b/src/stores/linkage.ts @@ -2,7 +2,7 @@ import { ref } from "vue"; import { defineStore } from "pinia"; import { useCounterMixin } from "./mixin"; -const { messageError, success, hideLoader } = useCounterMixin(); +const { messageErrorLinkage, success, hideLoader } = useCounterMixin(); export const useLinkageStore = defineStore("linkageData", () => { const apiURL = ref("http://127.0.0.1:51548"); // API URL From Agent @@ -38,7 +38,7 @@ export const useLinkageStore = defineStore("linkageData", () => { step.value = 2; }) .catch(async (error) => { - messageError(q, error); + messageErrorLinkage(q, error); }); } @@ -65,7 +65,7 @@ export const useLinkageStore = defineStore("linkageData", () => { getInfo(q); }) .catch((error) => { - messageError(q, error); + messageErrorLinkage(q, error); }); } @@ -93,7 +93,7 @@ export const useLinkageStore = defineStore("linkageData", () => { postReadIdCard(q); }) .catch((error) => { - messageError(q, error); + messageErrorLinkage(q, error); }); } @@ -127,7 +127,7 @@ export const useLinkageStore = defineStore("linkageData", () => { await amiConnect(q); }) .catch((error) => { - messageError(q, error); + messageErrorLinkage(q, error); }); } @@ -156,7 +156,7 @@ export const useLinkageStore = defineStore("linkageData", () => { return; }) .catch((error) => { - messageError(q, error); + messageErrorLinkage(q, error); }); } @@ -179,7 +179,7 @@ export const useLinkageStore = defineStore("linkageData", () => { return; }) .catch((error) => { - messageError(q, error); + messageErrorLinkage(q, error); }); } @@ -203,7 +203,7 @@ export const useLinkageStore = defineStore("linkageData", () => { return; }) .catch((error) => { - messageError(q, error); + messageErrorLinkage(q, error); }); } @@ -243,7 +243,7 @@ export const useLinkageStore = defineStore("linkageData", () => { await amiRequest(q, 9081); }) .catch((error) => { - messageError(q, error); + messageErrorLinkage(q, error); }); } @@ -336,7 +336,7 @@ export const useLinkageStore = defineStore("linkageData", () => { } }) .catch(async (error) => { - messageError(q, error); + messageErrorLinkage(q, error); hideLoader(); }); } @@ -364,7 +364,7 @@ export const useLinkageStore = defineStore("linkageData", () => { success(q, "disconnect successful."); }) .catch((error) => { - messageError(q, error); + messageErrorLinkage(q, error); }); } diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts index 4a15ce438..b46a6e085 100644 --- a/src/stores/mixin.ts +++ b/src/stores/mixin.ts @@ -481,6 +481,32 @@ export const useCounterMixin = defineStore("mixin", () => { } }; + const messageErrorLinkage = (q: any, e: any = "") => { + try { + q.dialog({ + component: CustomComponent, + componentProps: { + title: `พบข้อผิดพลาด`, + message: e.message, + icon: "warning", + color: "red", + onlycancel: true, + }, + }); + } catch (error) { + q.dialog({ + component: CustomComponent, + componentProps: { + title: `พบข้อผิดพลาด`, + message: `ไม่สามารถเชื่อมต่อกับฐานข้อมูลกรมการปกครองได้`, + icon: "warning", + color: "red", + onlycancel: true, + }, + }); + } + }; + const fails = (q: any, val: string) => { // useQuasar ไม่สามารถใช้นอกไฟล์ .vue if (val !== "") { @@ -1142,6 +1168,7 @@ export const useCounterMixin = defineStore("mixin", () => { modalError, dialogMessage, messageError, + messageErrorLinkage, showLoader, hideLoader, typeRetire,