Merge branch 'develop' into devTee

.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:

src/modules/10_order/components/step/step01.vue

@@ -57,7 +57,7 @@ const CommandOption = ref<DataOption1[]>([]);
 
 //Main
 const typeOrder = ref<any>();
-const nameOrder = ref<any>("");
+const nameOrder = ref<string>("");
 const command = ref<number | "">();
 const dateYear = ref<number | null>(null);
 const dateCommand = ref<Date | null>(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')
           "
         >
           <div class="col-xs-12 col-md-12">

src/modules/10_order/components/step/step04.vue

@@ -49,7 +49,7 @@ const statusOrder = ref<string>();
 const orderName = ref<string>("");
 const orderStatusName = ref<string>("");
 
-const orderId = ref<string>(orderId_params.toString());
+const orderId = ref<string>(orderId_params?.toString());
 onMounted(async () => {
   if (orderId.value) {
     await fetchAttachment(orderId.value);

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 "";
     }

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";

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')
               "
             />
             <q-tab name="5" label="ไฟล์เอกสาร" />
@@ -1095,4 +1095,4 @@ onMounted(async () => {
   top: 50%;
   transform: translateY(-50%);
 }
-</style>
+</style>