From a719fede02d9c816d0473eb0aea7a3dbbb74324f Mon Sep 17 00:00:00 2001 From: waruneeta Date: Wed, 12 Jul 2023 21:25:24 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6?= =?UTF-8?q?=E0=B8=81=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?= =?UTF-8?q?=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81=E0=B8=AB=E0=B8=99?= =?UTF-8?q?=E0=B9=88=E0=B8=A7=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=97?= =?UTF-8?q?=E0=B8=B5=E0=B9=88=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9A=E0=B8=A3?= =?UTF-8?q?=E0=B8=A3=E0=B8=88=E0=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../05_placement/components/pass/Detail.vue | 10 ++ .../05_placement/components/pass/OrgTree.vue | 97 ++++++++++--------- 2 files changed, 59 insertions(+), 48 deletions(-) diff --git a/src/modules/05_placement/components/pass/Detail.vue b/src/modules/05_placement/components/pass/Detail.vue index a24c5e852..34ab8931f 100644 --- a/src/modules/05_placement/components/pass/Detail.vue +++ b/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(""); const round = ref(""); const title = ref(""); +const examData = ref(); 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"); diff --git a/src/modules/05_placement/components/pass/OrgTree.vue b/src/modules/05_placement/components/pass/OrgTree.vue index f0309ef87..7aba3b1ec 100644 --- a/src/modules/05_placement/components/pass/OrgTree.vue +++ b/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([{ 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 = ""; } }