From d3248e38adf94aeebbf71faee1b0a316c6f9bb0f Mon Sep 17 00:00:00 2001 From: Kittapath Date: Wed, 15 Nov 2023 09:59:39 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=B2=20keycloak=20?= =?UTF-8?q?=E0=B9=83=E0=B8=AA=E0=B9=88=E0=B9=83=E0=B8=99=20env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 10 +++++++++- src/plugins/keycloak.ts | 12 ++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.env.production b/.env.production index 295eebac6..fcce87e13 100644 --- a/.env.production +++ b/.env.production @@ -4,4 +4,12 @@ VITE_QUALIFY_EXAM_PANEL=VITE_QUALIFY_EXAM_PANEL VITE_S3CLUSTER_PUBLIC_URL=VITE_S3CLUSTER_PUBLIC_URL VITE_REALM_KEYCLOAK=VITE_REALM_KEYCLOAK VITE_CLIENTID_KEYCLOAK=VITE_CLIENTID_KEYCLOAK -VITE_URL_KEYCLOAK=VITE_URL_KEYCLOAK \ No newline at end of file +VITE_URL_KEYCLOAK=VITE_URL_KEYCLOAK + +# VITE_COMPETITIVE_EXAM_PANEL: "https://bma-dashboard.frappet.synology.me/goto/KO0GpSu4z?orgId=1" +# VITE_QUALIFY_DISABLE_EMAM_PANEL: "https://bma-dashboard.frappet.synology.me/goto/dQQzpIX4z?orgId=1" +# VITE_QUALIFY_EXAM_PANEL: "https://bma-dashboard.frappet.synology.me/goto/cj1ZtIX4z?orgId=1" +# VITE_S3CLUSTER_PUBLIC_URL: "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/" +# VITE_REALM_KEYCLOAK: "bma-ehr" +# VITE_CLIENTID_KEYCLOAK: "bma-ehr-vue3" +# VITE_URL_KEYCLOAK: "https://id.frappet.synology.me/" \ No newline at end of file diff --git a/src/plugins/keycloak.ts b/src/plugins/keycloak.ts index 310e6c4c7..f4f4a64f1 100644 --- a/src/plugins/keycloak.ts +++ b/src/plugins/keycloak.ts @@ -7,12 +7,12 @@ import Keycloak from "keycloak-js"; // import router from "../router"; const initOptions = { - // realm: import.meta.env.VITE_REALM_KEYCLOAK, - // clientId: import.meta.env.VITE_CLIENTID_KEYCLOAK, - // url: import.meta.env.VITE_URL_KEYCLOAK, - realm: "bma-ehr", - clientId: "bma-ehr-vue3", - url: "https://id.frappet.synology.me/", + realm: import.meta.env.VITE_REALM_KEYCLOAK, + clientId: import.meta.env.VITE_CLIENTID_KEYCLOAK, + url: import.meta.env.VITE_URL_KEYCLOAK, + // realm: "bma-ehr", + // clientId: "bma-ehr-vue3", + // url: "https://id.frappet.synology.me/", }; //option keycloak ที่จะ connect const keycloak = Keycloak(initOptions); From d09e4c25c87b72d3973df5d9422f7a4ca48b4af6 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Wed, 15 Nov 2023 10:52:15 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1?= =?UTF-8?q?=E0=B8=A2=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=9C?= =?UTF-8?q?=E0=B8=B9=E0=B9=89=E0=B8=96=E0=B8=B9=E0=B8=81=E0=B8=A3=E0=B9=89?= =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B9=80=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialogs/AddPersonal.vue | 48 +++++++++---------- .../components/1_Complaint/Form.vue | 19 ++++++-- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue index 472ebae0d..f158e7235 100644 --- a/src/components/Dialogs/AddPersonal.vue +++ b/src/components/Dialogs/AddPersonal.vue @@ -27,15 +27,15 @@ interface tableType { } const rows = ref([]); -const type = ref("001"); +const type = ref("idcard"); const search = ref(""); const selected = ref([]); const dataObject = ref([]); const typeOps = ref([ - { id: "001", name: "เลขประจำตัวประชาชน" }, - { id: "002", name: "ชื่อ" }, - { id: "003", name: "นามสกุล" }, + { id: "idcard", name: "เลขประจำตัวประชาชน" }, + { id: "firstname", name: "ชื่อ" }, + { id: "lastname", name: "นามสกุล" }, ]); /** หัวข้อที่เเสดงในตาราง */ @@ -101,6 +101,11 @@ const props = defineProps({ modal: { type: Boolean, default: false, + required: true, + }, + btnTitle: { + type: String, + default: "เพิ่ม", }, title: { type: String, @@ -113,10 +118,12 @@ const props = defineProps({ close: { type: Function, default: () => console.log("not function"), + required: true, }, save: { type: Function, default: () => console.log("not function"), + required: true, }, }); @@ -227,8 +234,9 @@ onMounted(() => {
-
+
{ />
-
+
-
+
@@ -342,17 +342,15 @@ onMounted(() => {
- -
เพิ่ม
+ +
{{ props.btnTitle }}
- บันทึก + {{ props.btnTitle }}
diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue index 5ead0b113..8f374490b 100644 --- a/src/modules/11_discipline/components/1_Complaint/Form.vue +++ b/src/modules/11_discipline/components/1_Complaint/Form.vue @@ -7,13 +7,16 @@ import type { QTableProps } from "quasar"; import type { DataOption } from "@/modules/11_discipline/interface/index/Main"; import type { FormData, - MyObjectComplaintsRef,DataAddRequest + MyObjectComplaintsRef, + DataAddRequest, } from "@/modules/11_discipline/interface/request/complaint"; /** importStroe*/ import { useCounterMixin } from "@/stores/mixin"; import { useComplainstDataStore } from "@/modules/11_discipline/store/ComplaintsStore"; +import DialogAddPersonal from "@/components/Dialogs/AddPersonal.vue"; + const $q = useQuasar(); const router = useRouter(); const fileDocDataUpload = ref([]); @@ -290,8 +293,9 @@ function onSubmit() { } /**ชั่งฟังเพิ่มข้อมูล ลง ตาราง */ -async function addDatainTable() { - console.log("test"); +const modal = ref(false); +const toggleModal = () => (modal.value = !modal.value); +async function addPerson() { const listData: DataAddRequest[] = [ { id: "001", @@ -328,6 +332,7 @@ async function addDatainTable() { }, ]; await complainstStore.fetchComplainstAdd(listData); + toggleModal() } /** @@ -450,10 +455,16 @@ onMounted(() => {
- +
เพิ่ม
 +