From e801d8e7f2dbc247e1fd7ed52f83252e9148955a Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 9 Jul 2024 16:57:56 +0700 Subject: [PATCH 1/3] fixing --- src/modules/14_KPI/store.ts | 10 +++++++++- src/modules/14_KPI/views/detailView.vue | 14 +++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/modules/14_KPI/store.ts b/src/modules/14_KPI/store.ts index a581c53e9..4bbdf4d8f 100644 --- a/src/modules/14_KPI/store.ts +++ b/src/modules/14_KPI/store.ts @@ -128,7 +128,11 @@ export const useKpiDataStore = defineStore("KPIDataAdmin", () => { }, { id: "COMPLETE", - name: "เสร็จสิ้น", + name: "รอประกาศผลการประเมิน", + }, + { + id: "KP7", + name: "ประกาศและลงทะเบียนประวัติแล้ว", }, ]); @@ -339,6 +343,10 @@ export const useKpiDataStore = defineStore("KPIDataAdmin", () => { tabOpen.value = 4; tabMain.value = "4"; break; + case "KP7": + tabOpen.value = 4; + tabMain.value = "4"; + break; default: tabOpen.value = 1; tabMain.value = "1"; diff --git a/src/modules/14_KPI/views/detailView.vue b/src/modules/14_KPI/views/detailView.vue index d300bbe90..c8418a60d 100644 --- a/src/modules/14_KPI/views/detailView.vue +++ b/src/modules/14_KPI/views/detailView.vue @@ -112,9 +112,9 @@ async function fetchEvaluation() { .catch((e) => { messageError($q, e); }) - .finally(() => { - hideLoader(); - }); + .finally(() => { + hideLoader(); + }); } async function fetchProfile(id: string) { @@ -279,7 +279,7 @@ function filterOption(val: any, update: Function, refData: string) { // } async function getProfile() { await http - .get(config.API.profilePosition+`/${store.dataEvaluation.profileId}`) + .get(config.API.profilePosition + `/${store.dataEvaluation.profileId}`) .then(async (res) => { const data = await res.data.result; store.dataProfile = await data; @@ -305,7 +305,7 @@ function sendToEvaluatore() { if (id.value) { showLoader(); http - .put(config.API.kpiEvaluationUser+`/status/${id.value}`, { + .put(config.API.kpiEvaluationUser + `/status/${id.value}`, { status: "NEW_EVALUATOR", }) .then((res) => { @@ -804,7 +804,7 @@ onMounted(async () => { store.tabOpen < 4 || (store.tabOpen == 4 && store.rolePerson === 'USER' && - store.dataEvaluation.evaluationStatus != 'COMPLETE') + store.dataEvaluation.evaluationStatus != 'KP7') " /> @@ -1095,4 +1095,4 @@ onMounted(async () => { top: 50%; transform: translateY(-50%); } - \ No newline at end of file + From 0aefcf55a9e0feaa5dd9c2f07d2cb3a59b365d4d Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 9 Jul 2024 17:02:51 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 096fab0e2..b913841df 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,8 +9,8 @@ env: REGISTRY: docker.frappet.com IMAGE_NAME: ehr/bma-ehr-app DEPLOY_HOST: frappet.com - COMPOSE_PATH: /home/frappet/docker/bma-ehr - # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr + # COMPOSE_PATH: /home/frappet/docker/bma-ehr + COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr jobs: # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=latest -s DOCKER_USER=kittapath@frappet.com -s DOCKER_PASS=P@ssw0rd -s SSH_PASSWORD=FPTadmin2357 release-test: From 0bdb67b0ff187d0bd5f73938f3e786f6bfabbfd1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 9 Jul 2024 17:14:40 +0700 Subject: [PATCH 3/3] =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?= =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=20=3D>=20?= =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B9=80?= =?UTF-8?q?=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/10_order/components/step/step01.vue | 12 ++++++++---- src/modules/10_order/components/step/step04.vue | 2 +- src/modules/10_order/store.ts | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue index e06d50818..91c76df07 100644 --- a/src/modules/10_order/components/step/step01.vue +++ b/src/modules/10_order/components/step/step01.vue @@ -57,7 +57,7 @@ const CommandOption = ref([]); //Main const typeOrder = ref(); -const nameOrder = ref(""); +const nameOrder = ref(""); const command = ref(); const dateYear = ref(null); const dateCommand = ref(null); @@ -174,6 +174,7 @@ const fecthTypeOption = async (actions: string) => { .get(config.API.typeOrder()) .then((res) => { const response = res.data.result; + const filterRes = response.filter((e: any) => commandCodes.value.includes(e.commandCode) ); @@ -327,7 +328,8 @@ const optionsData = async (commandCode: string) => { orderTypeCode == "C-PM-01" || orderTypeCode == "C-PM-02" || orderTypeCode == "C-PM-03" || - orderTypeCode == "C-PM-04" + orderTypeCode == "C-PM-04" || + orderTypeCode == "C-PM-39" ) { fecthExamRoundOption(orderTypeCode); } @@ -504,7 +506,8 @@ const onSubmit = async () => { typeOrder.value.commandCode == "C-PM-01" || typeOrder.value.commandCode == "C-PM-02" || typeOrder.value.commandCode == "C-PM-03" || - typeOrder.value.commandCode == "C-PM-04" + typeOrder.value.commandCode == "C-PM-04" || + typeOrder.value.commandCode == "C-PM-39" ) { Object.assign(formdata, { examRound: examRound.value, @@ -1058,7 +1061,8 @@ const getClass = (val: boolean) => { (typeOrder.commandCode === 'C-PM-01' || typeOrder.commandCode === 'C-PM-02' || typeOrder.commandCode === 'C-PM-03' || - typeOrder.commandCode === 'C-PM-04') + typeOrder.commandCode === 'C-PM-04' || + typeOrder.commandCode === 'C-PM-39') " >
diff --git a/src/modules/10_order/components/step/step04.vue b/src/modules/10_order/components/step/step04.vue index 14ab30351..91bd9a60e 100644 --- a/src/modules/10_order/components/step/step04.vue +++ b/src/modules/10_order/components/step/step04.vue @@ -49,7 +49,7 @@ const statusOrder = ref(); const orderName = ref(""); const orderStatusName = ref(""); -const orderId = ref(orderId_params.toString()); +const orderId = ref(orderId_params?.toString()); onMounted(async () => { if (orderId.value) { await fetchAttachment(orderId.value); diff --git a/src/modules/10_order/store.ts b/src/modules/10_order/store.ts index a57153ea6..2fea55def 100644 --- a/src/modules/10_order/store.ts +++ b/src/modules/10_order/store.ts @@ -180,8 +180,8 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => { return "คำสั่งให้ลูกจ้างประจำได้รับค่าตอบแทนพิเศษ"; case "C-PM-38": return "แต่งตั้งข้าราชการให้ดำรงตำแหน่ง"; // คำสั่งปรับโครงสร้าง - // case "C-PM-39": - // return "คำสั่งปรับโครงสร้าง"; + case "C-PM-39": + return "คำสั่งเลื่อน : สำหรับข้าราชการ กทม. เดิม"; default: return ""; }