From 6dfb0bf067f408d130527cda55880e949d5643bf Mon Sep 17 00:00:00 2001 From: waruneeta Date: Fri, 18 Aug 2023 12:12:51 +0700 Subject: [PATCH 1/4] =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B8=A5=E0=B8=B5?= =?UTF-8?q?=E0=B9=88=E0=B8=A2=E0=B8=99=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=97?= =?UTF-8?q?=E0=B8=B5=E0=B9=88=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87?= =?UTF-8?q?=E0=B8=A3=E0=B8=AD=E0=B8=9A=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=20+=20?= =?UTF-8?q?=E0=B9=80=E0=B8=AB=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/07_insignia/components/1_Proposals/addProposals.vue | 2 +- src/modules/09_coin/components/1_Proposals/addProposals.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/07_insignia/components/1_Proposals/addProposals.vue b/src/modules/07_insignia/components/1_Proposals/addProposals.vue index 725b8ced2..11454cb64 100644 --- a/src/modules/07_insignia/components/1_Proposals/addProposals.vue +++ b/src/modules/07_insignia/components/1_Proposals/addProposals.vue @@ -327,7 +327,7 @@ const updateDateRange = () => { console.log(1) } else if (roundInsig.value.value == 2) { dateStart.value = new Date(new Date().getFullYear(), 3, 29); - dateEnd.value = new Date(new Date().getFullYear() + 1, 6, 28); + dateEnd.value = new Date(new Date().getFullYear(), 4, 29); console.log(2) } }; diff --git a/src/modules/09_coin/components/1_Proposals/addProposals.vue b/src/modules/09_coin/components/1_Proposals/addProposals.vue index 37613850f..e42909661 100644 --- a/src/modules/09_coin/components/1_Proposals/addProposals.vue +++ b/src/modules/09_coin/components/1_Proposals/addProposals.vue @@ -351,7 +351,7 @@ const updateDateRange = () => { console.log(1) } else if (roundCoin.value.value == 2) { dateStart.value = new Date(new Date().getFullYear(), 3, 29); - dateEnd.value = new Date(new Date().getFullYear() + 1, 6, 28); + dateEnd.value = new Date(new Date().getFullYear(), 4, 29); console.log(2) } }; From d92f628231f0c83f865dd99803f7a86b587e0ca4 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 18 Aug 2023 12:38:47 +0700 Subject: [PATCH 2/4] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20apii=20prod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/api/index.ts b/src/api/index.ts index 670fabab4..9b092ddf6 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -48,6 +48,8 @@ const config = ref({ API_URI_ORG_TREE: "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/tree_20230707_115124.json", MEET_URI: "meet.frappet.com", + API_RETIREMENT_URI: `${window.location.protocol}//${window.location.host}/api/v1`, + API_PROBATION_URI: "https://bmaehr.joolsoft.com/nodeapi/v1", }, }); From 5c8593cf4b4bbcd04e74224b6d79543a3109602f Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Fri, 18 Aug 2023 14:04:31 +0700 Subject: [PATCH 3/4] Currency input --- package.json | 1 + .../components/CurrencyInput.vue | 21 +++++++++++++++++++ .../Expulsion/expulsionRegistry.vue | 4 ++++ 3 files changed, 26 insertions(+) create mode 100644 src/modules/06_retirement/components/CurrencyInput.vue diff --git a/package.json b/package.json index 893544660..de70da7f7 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "quasar": "^2.11.1", "structure-chart": "^0.0.9", "vue": "^3.2.45", + "vue-currency-input": "^3.0.5", "vue-router": "^4.1.6", "vue3-datepicker": "^0.3.4", "vue3-pdfjs": "^0.1.6" diff --git a/src/modules/06_retirement/components/CurrencyInput.vue b/src/modules/06_retirement/components/CurrencyInput.vue new file mode 100644 index 000000000..f07e10f04 --- /dev/null +++ b/src/modules/06_retirement/components/CurrencyInput.vue @@ -0,0 +1,21 @@ + + + diff --git a/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue b/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue index 77f132a3d..583812fe2 100644 --- a/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue +++ b/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue @@ -271,11 +271,13 @@ :readonly="!edit" :borderless="!edit" v-model="salary" + @update:model-value="salary.toLocaleString('en-US')" :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือน'}`]" hide-bottom-space :label="`${'เงินเดือน'}`" type="number" /> +
@@ -364,6 +366,7 @@ import { onMounted, ref } from "vue"; import { useQuasar } from "quasar"; import { useRoute, useRouter } from "vue-router"; import { useCounterMixin } from "@/stores/mixin"; +import CurrencyInput from "@/modules/06_retirement/components/CurrencyInput.vue"; import http from "@/plugins/http"; import config from "@/app.config"; @@ -477,6 +480,7 @@ const getData = async () => { responseData.value.positionTypeOld = data.positionTypeOld ?? ""; responseData.value.reason = data.reason ?? ""; responseData.value.salary = data.salary !== null ? data.salary : 0; + responseData.value.status = data.status ?? ""; responseData.value.avataPath = data.avataPath ?? ""; responseData.value.fullname = `${data.firstName ?? "-"} ${ From cf75412206f8ca66eb2256334a177dfb25b72953 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Fri, 18 Aug 2023 14:29:09 +0700 Subject: [PATCH 4/4] currency --- .../components/CurrencyInput.vue | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/modules/06_retirement/components/CurrencyInput.vue b/src/modules/06_retirement/components/CurrencyInput.vue index f07e10f04..4894f47a2 100644 --- a/src/modules/06_retirement/components/CurrencyInput.vue +++ b/src/modules/06_retirement/components/CurrencyInput.vue @@ -2,20 +2,19 @@ - + return { inputRef }; + }, +}; + \ No newline at end of file