From a3c10761fa8783e7b331f7362144dfd583b6a7d0 Mon Sep 17 00:00:00 2001 From: oat_dev Date: Fri, 29 Mar 2024 16:33:59 +0700 Subject: [PATCH 1/9] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?= =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?= =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4:=20=E0=B9=81=E0=B8=81=E0=B9=89?= =?UTF-8?q?=E0=B9=84=E0=B8=82=20=E0=B8=9F=E0=B8=AD=E0=B8=A3=E0=B9=8C?= =?UTF-8?q?=E0=B8=A1=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=82?= =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/DialogAddData.vue | 142 +++++++----------- 1 file changed, 51 insertions(+), 91 deletions(-) diff --git a/src/modules/04_registryNew/components/DialogAddData.vue b/src/modules/04_registryNew/components/DialogAddData.vue index 909e18506..44b9f34ab 100644 --- a/src/modules/04_registryNew/components/DialogAddData.vue +++ b/src/modules/04_registryNew/components/DialogAddData.vue @@ -21,11 +21,9 @@ const profileStore = useProfileDataStore(); const $q = useQuasar(); const store = useRegistryNewDataStore(); const { - dialogRemove, dialogConfirm, success, messageError, - showLoader, hideLoader, dialogMessageNotify, date2Thai, @@ -54,24 +52,6 @@ const formData = reactive({ birthDate: null, }); -const prefixRef = ref(null); -const firstNameRef = ref(null); -const lastNameRef = ref(null); -const citizenIdRef = ref(null); -const positionRef = ref(null); -const posTypeIdRef = ref(null); -const posLevelIdRef = ref(null); - -const objectRef: MyObjectRef = { - prefix: prefixRef, - firstName: firstNameRef, - lastName: lastNameRef, - citizenId: citizenIdRef, - position: positionRef, - posTypeId: posTypeIdRef, - posLevelId: posLevelIdRef, -}; - function fetchPrefix() { http .get(config.API.orgPrefix) @@ -152,22 +132,6 @@ function clearFormData() { formData.birthDate = null; } -function validateForm() { - const hasError = []; - for (const key in objectRef) { - if (Object.prototype.hasOwnProperty.call(objectRef, key)) { - const property = objectRef[key]; - if (property.value && typeof property.value.validate === "function") { - const isValid = property.value.validate(); - hasError.push(isValid); - } - } - } - if (hasError.every((result) => result === true)) { - onSubmit(); - } -} - async function onSubmit() { dialogConfirm($q, async () => { await http @@ -209,35 +173,38 @@ watch( From d481bc56038325904085a7171baef9d83fca8b99 Mon Sep 17 00:00:00 2001 From: oat_dev Date: Fri, 29 Mar 2024 16:40:50 +0700 Subject: [PATCH 2/9] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?= =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?= =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4:=20=E0=B9=80=E0=B8=9E=E0=B8=B4?= =?UTF-8?q?=E0=B9=88=E0=B8=A1=20tooltip=20+=20=E0=B9=81=E0=B8=81=E0=B9=89?= =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=9C=E0=B8=B4=E0=B8=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../02_NameChangeHistory.vue | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue index 1f25b4837..35d63eae9 100644 --- a/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue +++ b/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue @@ -8,7 +8,6 @@ import http from "@/plugins/http"; import config from "@/app.config"; import dialogHeader from "@/components/DialogHeader.vue"; import { useCounterMixin } from "@/stores/mixin"; -import HistoryTable from "@/components/TableHistory.vue"; import type { ResponseObject } from "@/components/information/interface/response/OldName"; import type { Pagination } from "@/modules/04_registryNew/interface/index/Main"; import type { RequestItemsObject } from "@/components/information/interface/request/OldName"; @@ -229,14 +228,6 @@ function closeDialog() { dialog.value = false; } -// function clearForm() { -// changeNameData.status = ""; -// changeNameData.prefix = ""; -// changeNameData.firstName = ""; -// changeNameData.lastName = ""; -// alertUpload.value = false; -// } - async function onSubmit() { if (!!fileUpload.value) { await dialogConfirm( @@ -588,7 +579,9 @@ function filterSelector(val: string, update: Function, refData: string) { size="14px" icon="mdi-file-document-outline" @click="fetchProfile(props.row.id)" - /> + > + ดาวน์โหลด + + > + ดูประวัติการเปลี่ยนชื่อ-นามสกุล + From 4cf44a656eee30044cf1bae4c31948a7e2e1d474 Mon Sep 17 00:00:00 2001 From: puriphatt Date: Fri, 29 Mar 2024 16:49:33 +0700 Subject: [PATCH 3/9] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?= =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?= =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4:=20=E0=B9=81=E0=B8=81=E0=B9=89?= =?UTF-8?q?=E0=B9=84=E0=B8=82=E0=B8=95=E0=B8=B2=E0=B8=A3=E0=B8=B2=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Achievement/01_ProfessionalLicense.vue | 74 +++++------------- .../detail/Achievement/02_Train.vue | 40 ---------- .../detail/Achievement/03_Insignia.vue | 40 ---------- .../Achievement/04_DeclarationHonor.vue | 40 ---------- .../Achievement/05_ResultsPerformance.vue | 40 ---------- .../GovernmentInformation/02_Discipline.vue | 56 +++++--------- .../02_DisciplineHistory.vue | 20 ----- .../detail/GovernmentInformation/03_Leave.vue | 51 +++++-------- .../GovernmentInformation/03_LeaveHistory.vue | 20 ----- .../04_PerformSpecialWork.vue | 56 +++++--------- .../04_PerformSpecialWorkHistory.vue | 20 ----- .../detail/Other/01_OtherInformation.vue | 20 ----- .../Other/01_OtherInformationHistory.vue | 20 ----- .../detail/PersonalInformation/01_Profile.vue | 20 ----- .../02_NameChangeHistory.vue | 76 +++++-------------- .../detail/PersonalInformation/03_Address.vue | 20 ----- .../PersonalInformation/05_Education.vue | 76 +++++-------------- .../PersonalInformation/06_SpecialSkill.vue | 40 ---------- .../detail/Salary/01_PositionSalary.vue | 20 ----- .../Salary/01_PositionSalaryHistory.vue | 20 ----- .../detail/Salary/02_NotReceiveSalary.vue | 20 ----- .../Salary/02_NotReceiveSalaryHistory.vue | 20 ----- 22 files changed, 110 insertions(+), 699 deletions(-) diff --git a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue index cb75991a6..2195d1b9d 100644 --- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue +++ b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue @@ -297,21 +297,21 @@ async function editData(idData: string) { }); } -function deleteData(idData: string) { - dialogRemove($q, () => - http - .delete(config.API.profileNewCertificateByCertificateId(idData)) - .then(() => { - fetchData(id.value); - }) - .catch((err) => { - messageError($q, err); - }) - .finally(() => { - hideLoader(); - }) - ); -} +// function deleteData(idData: string) { +// dialogRemove($q, () => +// http +// .delete(config.API.profileNewCertificateByCertificateId(idData)) +// .then(() => { +// fetchData(id.value); +// }) +// .catch((err) => { +// messageError($q, err); +// }) +// .finally(() => { +// hideLoader(); +// }) +// ); +// } async function fetchHistoryData(id: string) { showLoader(); @@ -465,7 +465,7 @@ onMounted(async () => { > ประวัติแก้ไขใบอนุญาตประกอบวิชาชีพ - { v-close-popup > ลบข้อมูล - + --> @@ -529,26 +529,6 @@ onMounted(async () => { - @@ -774,26 +754,6 @@ onMounted(async () => { - diff --git a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue index fe13d0da0..d2aaba5f0 100644 --- a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue +++ b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue @@ -690,26 +690,6 @@ onMounted(async () => { - @@ -1164,26 +1144,6 @@ onMounted(async () => { - diff --git a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue index f023c6b4d..45224dd9e 100644 --- a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue +++ b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue @@ -789,26 +789,6 @@ onMounted(async () => { direction-links > - @@ -1218,26 +1198,6 @@ onMounted(async () => { direction-links > - diff --git a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue index 0a7fd4450..8d6addcb4 100644 --- a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue +++ b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue @@ -531,26 +531,6 @@ watch( direction-links > - @@ -849,26 +829,6 @@ watch( direction-links > - diff --git a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue index b8ef11535..0a4be22ad 100644 --- a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue +++ b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue @@ -583,26 +583,6 @@ onMounted(async () => { direction-links > - @@ -895,26 +875,6 @@ onMounted(async () => { direction-links > - diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue index fc7b7a7db..03ad52ace 100644 --- a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue +++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_Discipline.vue @@ -276,22 +276,22 @@ async function editData(idData: string) { }); } -function deleteData(idData: string) { - dialogRemove($q, () => - http - .delete(config.API.profileNewDisciplineByDisciplineId(idData)) - .then(() => { - fetchData(profileId.value); - success($q, "ลบข้อมูลสำเร็จ"); - }) - .catch((err) => { - messageError($q, err); - }) - .finally(() => { - hideLoader(); - }) - ); -} +// function deleteData(idData: string) { +// dialogRemove($q, () => +// http +// .delete(config.API.profileNewDisciplineByDisciplineId(idData)) +// .then(() => { +// fetchData(profileId.value); +// success($q, "ลบข้อมูลสำเร็จ"); +// }) +// .catch((err) => { +// messageError($q, err); +// }) +// .finally(() => { +// hideLoader(); +// }) +// ); +// } /** * กดเลือกข้อมูลที่จะแก้ไข * @param props ค่า props ใน row ที่เลือก @@ -467,7 +467,7 @@ onMounted(async () => { > ประวัติแก้ไขวินัย - { v-close-popup > ลบข้อมูล - + --> @@ -573,26 +573,6 @@ onMounted(async () => { direction-links > - diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue index c836f9888..5ba868aa4 100644 --- a/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue +++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/02_DisciplineHistory.vue @@ -280,26 +280,6 @@ watch(modal, (status) => { direction-links > - diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue index 5fccf2728..f372923bd 100644 --- a/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue +++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/03_Leave.vue @@ -55,7 +55,6 @@ const formFilter = reactive({ isProbation: false, }); - const modal = ref(false); const edit = ref(false); const modalHistory = ref(false); @@ -252,7 +251,11 @@ function openDialogEdit(props: DetailData) { edit.value = true; modal.value = true; id.value = props.id; - typeLeave.value = {id:props.typeLeaveId,name:props.typeLeave,code:props.code}; + typeLeave.value = { + id: props.typeLeaveId, + name: props.typeLeave, + code: props.code, + }; statLeave.value = props.status; reason.value = props.reason; dateRange.value = [ @@ -392,7 +395,7 @@ const editData = async () => { http .patch(config.API.profileNewLeaveById(id.value), { leaveTypeId: typeLeave.value.id, - dateLeaveStart : dateToISO(dateRange.value[0]), + dateLeaveStart: dateToISO(dateRange.value[0]), dateLeaveEnd: dateToISO(dateRange.value[1]), leaveDays: numLeave.value, leaveCount: 0, @@ -545,11 +548,7 @@ onMounted(() => { - @@ -760,7 +752,6 @@ onMounted(() => {
{ direction-links > - diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue index d298b9830..c97b21415 100644 --- a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue +++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWork.vue @@ -247,22 +247,22 @@ async function editData(idData: string) { /** ลบข้อมูล */ -function deleteData(idData: string) { - dialogRemove($q, () => - http - .delete(config.API.profileNewDutyByDutyId(idData)) - .then(() => { - fetchData(profileId.value); - success($q, "ลบข้อมูลสำเร็จ"); - }) - .catch((err) => { - messageError($q, err); - }) - .finally(() => { - hideLoader(); - }) - ); -} +// function deleteData(idData: string) { +// dialogRemove($q, () => +// http +// .delete(config.API.profileNewDutyByDutyId(idData)) +// .then(() => { +// fetchData(profileId.value); +// success($q, "ลบข้อมูลสำเร็จ"); +// }) +// .catch((err) => { +// messageError($q, err); +// }) +// .finally(() => { +// hideLoader(); +// }) +// ); +// } /** กด Submit */ @@ -421,7 +421,7 @@ onMounted(async () => { > ประวัติแก้ไขปฏิบัติราชการพิเศษ - { v-close-popup > ลบข้อมูล - + --> @@ -521,26 +521,6 @@ onMounted(async () => { direction-links > - diff --git a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue index ef9264f16..53cd2d0df 100644 --- a/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue +++ b/src/modules/04_registryNew/components/detail/GovernmentInformation/04_PerformSpecialWorkHistory.vue @@ -281,26 +281,6 @@ watch(modal, (status) => { direction-links > - diff --git a/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue b/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue index f638aa4f3..e7bc8b1b3 100644 --- a/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue +++ b/src/modules/04_registryNew/components/detail/Other/01_OtherInformation.vue @@ -395,26 +395,6 @@ onMounted(() => { direction-links > - diff --git a/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue b/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue index f46362eab..1d620f529 100644 --- a/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue +++ b/src/modules/04_registryNew/components/detail/Other/01_OtherInformationHistory.vue @@ -218,26 +218,6 @@ watch(modal, (status) => { direction-links > - diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue index 5189c7711..affc3f90e 100644 --- a/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue +++ b/src/modules/04_registryNew/components/detail/PersonalInformation/01_Profile.vue @@ -839,26 +839,6 @@ onMounted(async () => { direction-links > - diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue index 35d63eae9..16b89582d 100644 --- a/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue +++ b/src/modules/04_registryNew/components/detail/PersonalInformation/02_NameChangeHistory.vue @@ -372,22 +372,22 @@ function editData(idData: string) { }); } -function deleteData(idData: string) { - dialogRemove($q, () => - http - .delete(config.API.profileNewChangeNameByChangeNameId(idData)) - .then(() => { - fetchData(profileId.value); - success($q, "ลบข้อมูลสำเร็จ"); - }) - .catch((err) => { - messageError($q, err); - }) - .finally(() => { - hideLoader(); - }) - ); -} +// function deleteData(idData: string) { +// dialogRemove($q, () => +// http +// .delete(config.API.profileNewChangeNameByChangeNameId(idData)) +// .then(() => { +// fetchData(profileId.value); +// success($q, "ลบข้อมูลสำเร็จ"); +// }) +// .catch((err) => { +// messageError($q, err); +// }) +// .finally(() => { +// hideLoader(); +// }) +// ); +// } function deleteFileData(idData: string) { http @@ -612,7 +612,7 @@ function filterSelector(val: string, update: Function, refData: string) { > ดูประวัติการเปลี่ยนชื่อ-นามสกุล - ลบข้อมูล - + --> - @@ -934,26 +914,6 @@ function filterSelector(val: string, update: Function, refData: string) { - diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue index b7a6fa44d..c87668fc8 100644 --- a/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue +++ b/src/modules/04_registryNew/components/detail/PersonalInformation/03_Address.vue @@ -903,26 +903,6 @@ onMounted(async () => { direction-links > - diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue index 829696289..581588854 100644 --- a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue +++ b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue @@ -661,22 +661,22 @@ function editData(idData: string) { }); } -function deleteData(idData: string) { - dialogRemove($q, () => - http - .delete(config.API.profileNewEducationByEducationId(idData)) - .then(() => { - fetchData(id.value); - success($q, "ลบข้อมูลสำเร็จ"); - }) - .catch((err) => { - messageError($q, err); - }) - .finally(() => { - hideLoader(); - }) - ); -} +// function deleteData(idData: string) { +// dialogRemove($q, () => +// http +// .delete(config.API.profileNewEducationByEducationId(idData)) +// .then(() => { +// fetchData(id.value); +// success($q, "ลบข้อมูลสำเร็จ"); +// }) +// .catch((err) => { +// messageError($q, err); +// }) +// .finally(() => { +// hideLoader(); +// }) +// ); +// } onMounted(async () => { await fetchData(id.value); @@ -819,7 +819,7 @@ onMounted(async () => { > ประวัติแก้ไขประวัติการศึกษา - { v-close-popup > ลบข้อมูล - + --> @@ -945,26 +945,6 @@ onMounted(async () => {
- @@ -1468,26 +1448,6 @@ onMounted(async () => { - diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue index 0905a188a..5d5de6633 100644 --- a/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue +++ b/src/modules/04_registryNew/components/detail/PersonalInformation/06_SpecialSkill.vue @@ -501,26 +501,6 @@ onMounted(async () => { - @@ -664,26 +644,6 @@ onMounted(async () => { - diff --git a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue index 891148418..faa42288d 100644 --- a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue +++ b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalary.vue @@ -533,26 +533,6 @@ onMounted(() => { direction-links > - diff --git a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue index ead04e503..06c4f0719 100644 --- a/src/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue +++ b/src/modules/04_registryNew/components/detail/Salary/01_PositionSalaryHistory.vue @@ -321,26 +321,6 @@ watch( - diff --git a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue index 7fbf4750d..53b85fcc5 100644 --- a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue +++ b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalary.vue @@ -426,26 +426,6 @@ onMounted(() => { direction-links > - diff --git a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue index 56ce243c7..51d24ab5e 100644 --- a/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue +++ b/src/modules/04_registryNew/components/detail/Salary/02_NotReceiveSalaryHistory.vue @@ -222,26 +222,6 @@ watch(modal, (status) => { direction-links > --> - From b71859c5a51fa0da04ab6b78af44f062dc4d52ec Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 29 Mar 2024 17:02:32 +0700 Subject: [PATCH 4/9] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B8=84=E0=B9=88?= =?UTF-8?q?=E0=B8=B2=20&=20fix=20bug=20=E0=B8=A3=E0=B8=AD=E0=B8=9A=20?= =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B9=80=E0=B8=87=E0=B8=B4?= =?UTF-8?q?=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SalaryEmployeeLists/Dashboard.vue | 5 ++- .../SalaryEmployeeLists/TabMain.vue | 7 +++- .../components/SalaryLists/Dashboard.vue | 41 +++++++++++++++---- .../components/SalaryLists/TabMain.vue | 7 +++- src/modules/13_salary/views/salaryRound.vue | 8 ++-- 5 files changed, 55 insertions(+), 13 deletions(-) diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue b/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue index f74d35699..0d760227a 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue @@ -387,7 +387,10 @@ function fetchDataDashboard() { .then((res) => { const quota = res.data.result.dashboard; itemsCardAPR.value[0].total = quota.total; - itemsCardAPR.value[1].total = quota.fifteenPercent; + itemsCardAPR.value[1].total = quota.fifteenPercent.toLocaleString("en", { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + }); itemsCardAPR.value[2].total = quota.chosen; itemsCardAPR.value[3].total = quota.remaining; itemsCardAPR.value[4].total = quota.totalBackup; diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue index 99bb2d72f..949b3347c 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue @@ -256,7 +256,12 @@ function fetchDataPeriod(id: string) { pageSize: formFilter.pageSize.toString(), keyword: formFilter.keyword, type: store.tabType, - isRetire: isRetire.value === true ? "1" : "0", + isRetire: + store.roundMainCode === "APR" + ? null + : isRetire.value === true + ? "1" + : "0", }; http diff --git a/src/modules/13_salary/components/SalaryLists/Dashboard.vue b/src/modules/13_salary/components/SalaryLists/Dashboard.vue index ecbd1c1c3..7da38e319 100644 --- a/src/modules/13_salary/components/SalaryLists/Dashboard.vue +++ b/src/modules/13_salary/components/SalaryLists/Dashboard.vue @@ -392,17 +392,44 @@ function fetchDataDashboard() { .then((res) => { const quota = res.data.result.dashboard; itemsCardAPR.value[0].total = quota.total; - itemsCardAPR.value[1].total = quota.fifteenPercent; + itemsCardAPR.value[1].total = quota.fifteenPercent.toLocaleString("en", { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + }); itemsCardAPR.value[2].total = quota.chosen; itemsCardAPR.value[3].total = quota.remaining; itemsCardAPR.value[4].total = quota.totalBackup; - itemsCardOCT.value[0].total = quota.currentAmount; - itemsCardOCT.value[1].total = quota.sixPercentAmount; - itemsCardOCT.value[2].total = quota.spentAmount; - itemsCardOCT.value[3].total = quota.sixPercentSpentAmount; - itemsCardOCT.value[4].total = quota.useAmount; - itemsCardOCT.value[5].total = quota.remainingAmount; + itemsCardOCT.value[0].total = quota.currentAmount.toLocaleString("en", { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + }); + itemsCardOCT.value[1].total = quota.sixPercentAmount.toLocaleString( + "en", + { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + } + ); + itemsCardOCT.value[2].total = quota.spentAmount.toLocaleString("en", { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + }); + itemsCardOCT.value[3].total = quota.sixPercentSpentAmount.toLocaleString( + "en", + { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + } + ); + itemsCardOCT.value[4].total = quota.useAmount.toLocaleString("en", { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + }); + itemsCardOCT.value[5].total = quota.remainingAmount.toLocaleString("en", { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + }); itemsCardOCT.value[6].total = quota.totalBackup; itemsCardSpeciel.value[0].total = quota.total; diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue index ffcbd5e5f..e62e96084 100644 --- a/src/modules/13_salary/components/SalaryLists/TabMain.vue +++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue @@ -265,7 +265,12 @@ function fetchDataPeriod(id: string) { pageSize: formFilter.pageSize.toString(), keyword: formFilter.keyword, type: store.tabType, - isRetire: isRetire.value === true ? "1" : "0", + isRetire: + store.roundMainCode === "APR" + ? null + : isRetire.value === true + ? "1" + : "0", }; http diff --git a/src/modules/13_salary/views/salaryRound.vue b/src/modules/13_salary/views/salaryRound.vue index 7c5c84242..8ddfb48b5 100644 --- a/src/modules/13_salary/views/salaryRound.vue +++ b/src/modules/13_salary/views/salaryRound.vue @@ -421,8 +421,7 @@ onMounted(async () => { color="edit" size="17px" :name=" - dateToISO(new Date()) >= - dateToISO(props.row.effectiveDate) + props.row.revisionId !== null ? 'mdi-eye-outline' : 'edit' " @@ -439,7 +438,10 @@ onMounted(async () => { Date: Fri, 29 Mar 2024 17:07:52 +0700 Subject: [PATCH 5/9] fix bug query isRetire for round special --- .../13_salary/components/SalaryEmployeeLists/TabMain.vue | 2 +- src/modules/13_salary/components/SalaryLists/TabMain.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue index 949b3347c..5dc803417 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue @@ -257,7 +257,7 @@ function fetchDataPeriod(id: string) { keyword: formFilter.keyword, type: store.tabType, isRetire: - store.roundMainCode === "APR" + store.roundMainCode !== "OCT" ? null : isRetire.value === true ? "1" diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue index e62e96084..c340ca980 100644 --- a/src/modules/13_salary/components/SalaryLists/TabMain.vue +++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue @@ -266,7 +266,7 @@ function fetchDataPeriod(id: string) { keyword: formFilter.keyword, type: store.tabType, isRetire: - store.roundMainCode === "APR" + store.roundMainCode !== "OCT" ? null : isRetire.value === true ? "1" From f07f3acd5122a14cfd2398154eac20b499cf8c73 Mon Sep 17 00:00:00 2001 From: oat_dev Date: Fri, 29 Mar 2024 17:08:52 +0700 Subject: [PATCH 6/9] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?= =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?= =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4:=20clearable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/Achievement/01_ProfessionalLicense.vue | 8 ++++++-- .../components/detail/Achievement/02_Train.vue | 10 ++++++---- .../detail/PersonalInformation/04_Family.vue | 4 ---- .../detail/PersonalInformation/05_Education.vue | 2 -- .../04_registryNew/interface/request/ProfesLicense.ts | 2 +- .../04_registryNew/interface/request/Training.ts | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue index 2195d1b9d..c7d10d1c8 100644 --- a/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue +++ b/src/modules/04_registryNew/components/detail/Achievement/01_ProfessionalLicense.vue @@ -9,6 +9,7 @@ import type { RequestItemsObject } from "@/modules/04_registryNew/interface/requ import type { ResponseObject } from "@/modules/04_registryNew/interface/response/ProfesLicense"; import http from "@/plugins/http"; import config from "@/app.config"; +import { log } from "console"; const mixin = useCounterMixin(); const $q = useQuasar(); const { @@ -179,7 +180,7 @@ const profesLicenseData = reactive({ issuer: "", certificateNo: "", issueDate: new Date(), - expireDate: new Date(), + expireDate: null, profileId: id.value, }); @@ -244,7 +245,7 @@ async function fetchData(id: string) { } function clearForm() { - profesLicenseData.expireDate = new Date(); + profesLicenseData.expireDate = null; profesLicenseData.issueDate = new Date(); profesLicenseData.certificateNo = ""; profesLicenseData.certificateType = ""; @@ -642,6 +643,8 @@ onMounted(async () => { dense outlined bg-color="white" + clearable + @clear="() => (profesLicenseData.expireDate = null)" hide-bottom-space :model-value=" profesLicenseData.expireDate @@ -649,6 +652,7 @@ onMounted(async () => { : '' " :label="`${'วันที่หมดอายุ'}`" + @update:modelValue="profesLicenseData.expireDate" >