diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index 7ddc04753..3838b0228 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -10,6 +10,7 @@ const placemenRelocation = `${placement}/relocation`; const placemenOther = `${env.API_URI}/retirement/other`; const placemenAppointment = `${placement}/appointment`; + export default { MainDetail: (year: number) => `${placement}/exam/${year}`, yearOptions: () => `${placement}/fiscal`, @@ -59,6 +60,10 @@ export default { // clear Position clearPosition: (personalId: string) => `${placement}/position/clear/${personalId}`, + // Document + documentByid: (personalId: string) => `${placement}/doc/${personalId}`, + documentDelid: (personalId: string, docid: string) => `${placement}/doc/${personalId}/${docid}`, + // order organizationsOrder: () => `${order}/order/organizations`, diff --git a/src/modules/05_placement/components/PersonalDetail/Detail.vue b/src/modules/05_placement/components/PersonalDetail/Detail.vue index a13b796e7..1d2f87603 100644 --- a/src/modules/05_placement/components/PersonalDetail/Detail.vue +++ b/src/modules/05_placement/components/PersonalDetail/Detail.vue @@ -9,6 +9,8 @@ import { useQuasar } from "quasar"; import http from "@/plugins/http"; import config from "@/app.config"; +import { usePersonalDataStore } from "@/modules/05_placement/storePersona"; + import Informationvue from "@/modules/05_placement/components/PersonalDetail/Information/Information.vue"; import Addressvue from "@/modules/05_placement/components/PersonalDetail/Information/Address.vue"; import EducationVue from "@/modules/05_placement/components/PersonalDetail/Education.vue"; @@ -16,7 +18,7 @@ import Certicate from "@/modules/05_placement/components/PersonalDetail/Informat import ExamResult from "@/modules/05_placement/components/PersonalDetail/ExamResult.vue"; import Qualification from "@/modules/05_placement/components/PersonalDetail/Qualification.vue"; import Familyvue from "@/modules/05_placement/components/PersonalDetail/Information/Family.vue"; -// import Document from "@/modules/05_placement/components/PersonalDetail/Information/Document.vue"; +import Document from "@/modules/05_placement/components/PersonalDetail/Information/Document.vue"; import { AddressDataDefualt, @@ -38,6 +40,7 @@ const $q = useQuasar(); // show dialog const router = useRouter(); const store = useDataStore(); const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง +const storePersonal = usePersonalDataStore(); const { showLoader, hideLoader, messageError } = mixin; const { changeTab } = store; const statusEdit = ref(false); @@ -115,7 +118,7 @@ const fetchData = async () => { .get(config.API.placementPersonalId(examId.value)) .then((res: any) => { const data = res.data.result; - + storePersonal.fecthDataInformation(data); personalData.value.fullName = data.fullName; personalData.value.id = data.personalId; @@ -253,7 +256,7 @@ const fetchData = async () => { รายละเอียดของ {{ personalData.fullName }} -
+
{
- +
diff --git a/src/modules/05_placement/components/PersonalDetail/Education.vue b/src/modules/05_placement/components/PersonalDetail/Education.vue index 750d237f8..10ed86e72 100644 --- a/src/modules/05_placement/components/PersonalDetail/Education.vue +++ b/src/modules/05_placement/components/PersonalDetail/Education.vue @@ -284,7 +284,7 @@ watch(visibleColumns, async (count: String[], prevCount: String[]) => { onMounted(async () => { await fetchLevel(); await fetchPositionPath(); - await props.fetch(); + // await props.fetch(); rows.value = props.data; }); diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Address.vue b/src/modules/05_placement/components/PersonalDetail/Information/Address.vue index e83889aa4..36737904c 100644 --- a/src/modules/05_placement/components/PersonalDetail/Information/Address.vue +++ b/src/modules/05_placement/components/PersonalDetail/Information/Address.vue @@ -67,17 +67,17 @@ const registAddress = reactive({ zipCode: "", districtId: "", provinceId: "", -}) +}); const currentAddress = reactive({ subDistrictId: "", zipCode: "", districtId: "", provinceId: "", -}) +}); onMounted(async () => { - await getNewData(); + // await getNewData(); emit("update:statusEdit", false); }); @@ -126,7 +126,9 @@ const filterSelector = (val: any, update: Function, refData: string) => { const refreshData = async () => { myform.value.reset(); - await getNewData(); + await props.fetch(); + await fetchProvince(); + // await getNewData(); }; const getNewData = async () => { @@ -179,7 +181,9 @@ const editData = async () => { .finally(async () => { edit.value = false; emit("update:statusEdit", false); - await getNewData(); + // await getNewData(); + await props.fetch(); + await fetchProvince(); }); }; @@ -196,13 +200,13 @@ const saveData = async () => { const selectProvince = async (e: string | null, name: string) => { if (e != null) { if (name == "1") { - registAddress.subDistrictId = "" - registAddress.zipCode = "" - registAddress.districtId = "" + registAddress.subDistrictId = ""; + registAddress.zipCode = ""; + registAddress.districtId = ""; } else { - currentAddress.subDistrictId = "" - currentAddress.zipCode = "" - currentAddress.districtId = "" + currentAddress.subDistrictId = ""; + currentAddress.zipCode = ""; + currentAddress.districtId = ""; } myform.value.resetValidation(); await fetchDistrict(e, name); @@ -253,36 +257,58 @@ const fetchProvince = async () => { Ops.value.provinceOps = option; OpsFilter.value.provinceOps = option; - const checkRegistProvinceId = await option.find((e: any) => e.id === addressData.value.registProvinceId) + const checkRegistProvinceId = await option.find( + (e: any) => e.id === addressData.value.registProvinceId + ); // ที่อยู่ถ้า id จังหวัดว่างไม่ดึงค่าอำเภอ ตำบล และรหัสไปรษณีย์ - if (addressData.value.registProvinceId == '' || addressData.value.registProvinceId == '00000000-0000-0000-0000-000000000000' || !checkRegistProvinceId) { - registAddress.subDistrictId = "" - registAddress.zipCode = "" - registAddress.districtId = "" + if ( + addressData.value.registProvinceId == "" || + addressData.value.registProvinceId == + "00000000-0000-0000-0000-000000000000" || + !checkRegistProvinceId + ) { + registAddress.subDistrictId = ""; + registAddress.zipCode = ""; + registAddress.districtId = ""; } else { - registAddress.provinceId = await addressData.value.registProvinceId - registAddress.zipCode = await addressData.value.registZipCode + registAddress.provinceId = await addressData.value.registProvinceId; + registAddress.zipCode = await addressData.value.registZipCode; await fetchDistrict(addressData.value.registProvinceId, "1"); - if (addressData.value.registDistrictId != null && addressData.value.registDistrictId != '00000000-0000-0000-0000-000000000000') { + if ( + addressData.value.registDistrictId != null && + addressData.value.registDistrictId != + "00000000-0000-0000-0000-000000000000" + ) { await fetchSubDistrict(addressData.value.registDistrictId, "1"); } } - const checkCurrentProvinceId = await option.find((e: any) => e.id === addressData.value.currentProvinceId) + const checkCurrentProvinceId = await option.find( + (e: any) => e.id === addressData.value.currentProvinceId + ); // ที่อยู่ปัจจุบันถ้า id จังหวัดว่างไม่ดึงค่าอำเภอ ตำบล และรหัสไปรษณีย์ - if (addressData.value.currentProvinceId == '' || addressData.value.currentProvinceId == '00000000-0000-0000-0000-000000000000' || !checkCurrentProvinceId) { - currentAddress.subDistrictId = "" - currentAddress.zipCode = "" - currentAddress.districtId = "" + if ( + addressData.value.currentProvinceId == "" || + addressData.value.currentProvinceId == + "00000000-0000-0000-0000-000000000000" || + !checkCurrentProvinceId + ) { + currentAddress.subDistrictId = ""; + currentAddress.zipCode = ""; + currentAddress.districtId = ""; } else { - currentAddress.provinceId = addressData.value.currentProvinceId - currentAddress.zipCode = addressData.value.currentZipCode + currentAddress.provinceId = addressData.value.currentProvinceId; + currentAddress.zipCode = addressData.value.currentZipCode; await fetchDistrict(addressData.value.currentProvinceId, "2"); - if (addressData.value.currentDistrictId != null && addressData.value.currentDistrictId != '00000000-0000-0000-0000-000000000000') { + if ( + addressData.value.currentDistrictId != null && + addressData.value.currentDistrictId != + "00000000-0000-0000-0000-000000000000" + ) { await fetchSubDistrict(addressData.value.currentDistrictId, "2"); } } @@ -312,19 +338,23 @@ const fetchDistrict = async (id: string | null, position: string) => { OpsFilter.value.districtOps = option; // ที่อยู่ เช็คอำเภอว่ามี id ใน array ไหม ถ้ามีค่อยกำหนดค่าไปในตัวแปรใหม่เพิ่มแสดงผล - const checkRegistDistrictId = option.find((e: any) => e.id === addressData.value.registDistrictId) + const checkRegistDistrictId = option.find( + (e: any) => e.id === addressData.value.registDistrictId + ); if (checkRegistDistrictId) { - registAddress.districtId = addressData.value.registDistrictId + registAddress.districtId = addressData.value.registDistrictId; } } else { Ops.value.districtCOps = option; OpsFilter.value.districtCOps = option; // ที่อยู่ปัจจุบัน เช็คอำเภอว่ามี id ใน array ไหม ถ้ามีค่อยกำหนดค่าไปในตัวแปรใหม่เพิ่มแสดงผล - const checkCurrentDistrictId = await option.find((e: any) => e.id === addressData.value.currentDistrictId) + const checkCurrentDistrictId = await option.find( + (e: any) => e.id === addressData.value.currentDistrictId + ); if (checkCurrentDistrictId) { - currentAddress.districtId = addressData.value.currentDistrictId + currentAddress.districtId = addressData.value.currentDistrictId; } } }) @@ -358,18 +388,23 @@ const fetchSubDistrict = async (id: string | null, position: string) => { OpsFilter.value.subdistrictOps = option; // ที่อยู่ เช็คตำบลว่ามี id ใน array ไหม ถ้ามีค่อยกำหนดค่าไปในตัวแปรใหม่เพิ่มแสดงผล - const checkRegistSubDistrictId = await option.find((e: any) => e.id === addressData.value.registSubDistrictId) + const checkRegistSubDistrictId = await option.find( + (e: any) => e.id === addressData.value.registSubDistrictId + ); if (checkRegistSubDistrictId) { - registAddress.subDistrictId = addressData.value.registSubDistrictId + registAddress.subDistrictId = addressData.value.registSubDistrictId; } } else { Ops.value.subdistrictCOps = option; OpsFilter.value.subdistrictCOps = option; // ที่อยู่ปัจจุบัน เช็คตำบลว่ามี id ใน array ไหม ถ้ามีค่อยกำหนดค่าไปในตัวแปรใหม่เพิ่มแสดงผล - const checkCurrentSubDistrictId = await option.find((e: any) => e.id === addressData.value.currentSubDistrictId) + const checkCurrentSubDistrictId = await option.find( + (e: any) => e.id === addressData.value.currentSubDistrictId + ); if (checkCurrentSubDistrictId) { - currentAddress.subDistrictId = addressData.value.currentSubDistrictId + currentAddress.subDistrictId = + addressData.value.currentSubDistrictId; } } }) @@ -405,91 +440,268 @@ const getClass = (val: boolean) => {