diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 900c7fd..62ec8eb 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-user DEPLOY_HOST: frappet.com - COMPOSE_PATH: /home/frappet/docker/bma-ehr - # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-user + # COMPOSE_PATH: /home/frappet/docker/bma-ehr + COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-user jobs: # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=test-v6.1 -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue index 1da237a..8c97ac2 100644 --- a/src/modules/03_retire/views/addRetire.vue +++ b/src/modules/03_retire/views/addRetire.vue @@ -71,9 +71,9 @@ const clickBack = () => { const statusOrder = (val: boolean) => { switch (val) { case true: - return "ยับยั้งการลาออก"; + return "ยับยั้ง"; case false: - return "อนุมัติการลาออก"; + return "อนุญาต"; } }; diff --git a/src/modules/08_KPI/components/Tab/04_Result.vue b/src/modules/08_KPI/components/Tab/04_Result.vue index a9f7196..b7d85a0 100644 --- a/src/modules/08_KPI/components/Tab/04_Result.vue +++ b/src/modules/08_KPI/components/Tab/04_Result.vue @@ -243,7 +243,7 @@ onMounted(() => { (12); store.tabOpen < 4 || (store.tabOpen == 4 && store.rolePerson === 'USER' && - store.dataEvaluation.evaluationStatus != 'COMPLETE') + store.dataEvaluation.evaluationStatus != 'KP7') " /> diff --git a/src/modules/08_KPI/store.ts b/src/modules/08_KPI/store.ts index efe3bea..dadbf30 100644 --- a/src/modules/08_KPI/store.ts +++ b/src/modules/08_KPI/store.ts @@ -327,6 +327,10 @@ export const useKpiDataStore = defineStore("KPIDate", () => { tabOpen.value = 4; tabMain.value = "4"; break; + case "KP7": + tabOpen.value = 4; + tabMain.value = "4"; + break; default: tabOpen.value = 1; tabMain.value = "1";