บันทึกข้อมูลเลือกหน่วยงานที่รับบรรจุ

src/modules/05_placement/components/pass/Detail.vue

@@ -8,6 +8,9 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin"
 import { useQuasar } from "quasar"
+import { usePlacementDataStore } from "@/modules/05_placement/store";
+
+const DataStore = usePlacementDataStore();
 
 const $q = useQuasar
 const mixin = useCounterMixin()
@@ -19,6 +22,7 @@ const examId = route.params.examId;
 const year = ref<string>("");
 const round = ref<string>("");
 const title = ref<string>("");
+const examData = ref<any>();
 const AddTablePosition = defineAsyncComponent(
   () => import("@/modules/05_placement/components/pass/Table.vue")
 );
@@ -53,6 +57,12 @@ const getStat = async () => {
 };
 
 onMounted(async () => {
+  examData.value = await DataStore.DataMainOrig.find((x: any) => x.id == examId);
+  // console.log("DataStore===>", DataStore.DataMainOrig.find((x: any) => x.id == examId))
+  title.value = examData.value.examRound;
+  round.value = examData.value.examOrder;
+  year.value = examData.value.fiscalYear;
+
   await getStat()
   if (keycloak.tokenParsed != null) {
     roleAdmin.value = await keycloak.tokenParsed.role.includes("placement1");

src/modules/05_placement/components/pass/OrgTree.vue

@@ -116,7 +116,7 @@ const saveAppoint = async () => {
                 mouthSalaryAmount: dataForm.mouthSalaryAmount,
                 positionSalaryAmount: dataForm.positionSalaryAmount,
             };
-            console.log("save appoint===>", dataAppoint);
+            // console.log("save appoint===>", dataAppoint);
 
             showLoader();
             await http
@@ -128,25 +128,11 @@ const saveAppoint = async () => {
                 .catch((e) => {
                     messageError($q, e);
                 })
-                .finally(() => {
+                .finally(async () => {
+                    await closeAndClear()
+                    await resetFilter()
                     hideLoader()
-                    close()
                 });
-
-            resetFilter()
-            // Clear form
-            selected.value = "";
-            dataForm.personalId = '';
-            dataForm.containDate = new Date()
-            dataForm.posNoId = ""
-            dataForm.positionId = ""
-            dataForm.positionLevelId = ""
-            dataForm.positionLineId = ""
-            dataForm.positionPathSideId = ""
-            dataForm.positionTypeId = ""
-            dataForm.salaryAmount = null
-            dataForm.mouthSalaryAmount = null;
-            dataForm.positionSalaryAmount = null
         }
     });
 };
@@ -173,8 +159,8 @@ const closeModal = () => {
     }
 }
 
-const closeAndClear = () => {
-    props.close();
+const closeAndClear = async () => {
+    await props.close();
     editDataStatus.value = false;
     selected.value = ""
     dataForm.personalId = '';
@@ -223,59 +209,74 @@ const positionLevelOptions = ref<Object[]>([{
 const selectedPosition = async (data: any) => {
 
     if (data.name == null && selected.value != data.keyId) {
+        console.log("selecteds", data)
+
         editDataStatus.value = true;
-        // console.log("selected", data)
         selected.value = data.keyId
 
         // posNo Options
-        posNoOptions.value = await [{
+        posNoOptions.value = [{
             label: data.positionNum,
-            value: data.positionNumInt,
+            value: data.positionNumId,
         }]
-        dataForm.posNoId = data.positionNumInt;
+        dataForm.posNoId = data.positionNumId;
 
         // position Options
-        positionOptions.value = await [{
+        positionOptions.value = [{
             label: data.positionName,
-            value: data.positionMasterId,
+            value: data.positionNameId,
         }]
-        dataForm.positionId = data.positionMasterId;
+        dataForm.positionId = data.positionNameId;
 
         // positionPathSide Options
-        positionPathSideOptions.value = await [{
-            label: data.positionSideName,
-            value: data.positionSideName,
-        }]
-        dataForm.positionPathSideId = data.positionSideName;
+        let positionPathSideArr: any = [];
+        if (data.positionSideNameObj != null) {
+            data.positionSideNameObj.map((x: any) => {
+                positionLevelsArr.push({
+                    label: x.Name,
+                    value: x.Id,
+                })
+            })
+            positionPathSideOptions.value = positionPathSideArr;
+            dataForm.positionPathSideId = positionPathSideArr.length > 1 || positionPathSideArr.length == 0 ? '' : positionPathSideArr[0].value;
+        }
 
         // positionType Options
-        positionTypeOptions.value = await [{
+        positionTypeOptions.value = [{
             label: data.positionType,
-            value: data.positionType,
+            value: data.positionTypeId,
         }]
-        dataForm.positionTypeId = data.positionType;
+        dataForm.positionTypeId = data.positionTypeId;
 
         // positionLine Options
-        // positionLineOptions.value = await [{
-        //     label: data.positionType,
-        //     value: data.positionType,
-        // }]
-        // dataForm.positionLineId = data.positionType;
+        positionLineOptions.value = [{
+            label: data.positionLine,
+            value: data.positionLineId,
+        }]
+        dataForm.positionLineId = data.positionLineId;
+
 
         // positionLevel Options
-        const positionLevelsSplit = data.positionLevel.split(',')
         let positionLevelsArr: any = [];
-        positionLevelsSplit.map((x: string) => {
-            positionLevelsArr.push({
-                label: x,
-                value: x,
+        if (data.positionLevelObj != null) {
+            data.positionLevelObj.map((x: any) => {
+                positionLevelsArr.push({
+                    label: x.Name,
+                    value: x.Id,
+                })
             })
-        })
-        positionLevelOptions.value = positionLevelsArr;
-        dataForm.positionLevelId = positionLevelsArr.length > 1 || positionLevelsArr.length == 0 ? '' : positionLevelsArr[0].value;
+            positionLevelOptions.value = positionLevelsArr;
+            dataForm.positionLevelId = positionLevelsArr.length > 1 || positionLevelsArr.length == 0 ? '' : positionLevelsArr[0].value;
+        }
 
     } else if (selected.value == data.keyId) {
         selected.value = '';
+        dataForm.posNoId = "";
+        dataForm.positionId = "";
+        dataForm.positionLevelId = "";
+        dataForm.positionLineId = "";
+        dataForm.positionPathSideId = "";
+        dataForm.positionTypeId = "";
     }
 }
 </script>