From b436288c9b711f030456ebee041bbb4d5011d95c Mon Sep 17 00:00:00 2001 From: "STW_TTTY\\stwtt" Date: Fri, 5 Apr 2024 09:26:07 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20=E0=B8=94?= =?UTF-8?q?=E0=B8=B6=E0=B8=87=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?= =?UTF-8?q?=E0=B8=A5=E0=B8=A5=E0=B8=87=20=E0=B8=9F=E0=B8=AD=E0=B8=A3?= =?UTF-8?q?=E0=B9=8C=E0=B8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/history/AddPage.vue | 28 +++++++++++++------ .../components/history/DialogGov.vue | 1 - .../components/historyEmployee/AddPage.vue | 16 +++++++---- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/modules/15_development/components/history/AddPage.vue b/src/modules/15_development/components/history/AddPage.vue index ce9f65e0e..1547be9d1 100644 --- a/src/modules/15_development/components/history/AddPage.vue +++ b/src/modules/15_development/components/history/AddPage.vue @@ -22,8 +22,7 @@ const route = useRoute(); const id = ref(route.params.id as string); const $q = useQuasar(); const mixin = useCounterMixin(); -const { dialogConfirm, showLoader, hideLoader, messageError, date2Thai } = - mixin; +const { dialogConfirm, showLoader, hideLoader, messageError, date2Thai } = mixin; const store = useDevelopmentDataStore(); const modalDialogGov = ref(false); const modalDialogProject = ref(false); @@ -118,7 +117,6 @@ function onSubmit() { showLoader(); http[id.value ? "put" : "post"](url, body) .then((res) => { - console.log(res); router.push(`/development/history`); }) .catch((e) => { @@ -146,9 +144,18 @@ function upDate(data: FormAddHistory) { } function upDateProject(data: any) { - formMainProject.id = data.id; - formMainProject.project = data.project; - formMainProject.year = data.year; +formMainProject.id = data.id ? data.id : null +formMainProject.project = data.project ? data.project : null +formMainProject.year = data.year ? data.year : null +formMainProject.trainingStart = data.dateStart ? data.dateStart : null +formMainProject.trainingEnd = data.dateEnd ? data.dateEnd : null +formMainProject.totalTraining = data.totalDate ? data.totalDate : null +formMainProject.location = data.addressAcademic ? data.addressAcademic : null +formMainProject.topic = data.topicAcademic ? data.topicAcademic : null +formMainProject.studyStart = data.studyStart ? data.studyStart : null +formMainProject.studyEnd = data.studyEnd ? data.studyEnd : null +formMainProject.organizingTraining = data.organizingTraining ? data.organizingTraining : null + } function getDataEdit() { @@ -175,9 +182,9 @@ function getDataEdit() { formMainProject.project = data.projectName; formMainProject.year = data.year; - formMainProject.trainingStartdateStart = data.dateStart; - formMainProject.trainingEnddateEnd = data.dateEnd; - formMainProject.totalTrainingtotalDate = data.totalDate; + formMainProject.trainingStart = data.dateStart; + formMainProject.trainingEnd = data.dateEnd; + formMainProject.totalTraining = data.totalDate; formMainProject.location = data.addressAcademic; formMainProject.topic = data.topicAcademic; formMainProject.studyStart = data.dateStudyStart; @@ -305,6 +312,9 @@ onMounted(() => { {{ formMainProject[field] ? formMainProject[field] + 543 : "-" }} + {{ + formMainProject[field] ? date2Thai(formMainProject[field]) : "-" + }} {{ formMainProject[field] ? formMainProject[field] : "-" }} diff --git a/src/modules/15_development/components/history/DialogGov.vue b/src/modules/15_development/components/history/DialogGov.vue index cc4dd7486..ed8cf6017 100644 --- a/src/modules/15_development/components/history/DialogGov.vue +++ b/src/modules/15_development/components/history/DialogGov.vue @@ -183,7 +183,6 @@ function searchFilter() { `?page=${formFilter.page}&pageSize=${formFilter.pageSize}&searchField=${search.value}&searchKeyword=${inputSearch.value}` ) .then((res) => { - console.log(res.data.result.data); const data = res.data.result.data; maxPage.value = Math.ceil(res.data.result.total / formFilter.pageSize); rows.value = data.map((item: any) => ({ diff --git a/src/modules/15_development/components/historyEmployee/AddPage.vue b/src/modules/15_development/components/historyEmployee/AddPage.vue index e88a085ce..6ffd87d35 100644 --- a/src/modules/15_development/components/historyEmployee/AddPage.vue +++ b/src/modules/15_development/components/historyEmployee/AddPage.vue @@ -104,7 +104,7 @@ function onSubmit() { lastName: formMain.lastName, citizenId: formMain.citizenId, position: formMain.position, - posExecutive:null, + posExecutive: null, posLevelId: formMain.posLevelId, posTypeId: formMain.posTypeId, @@ -116,7 +116,6 @@ function onSubmit() { showLoader(); http[id.value ? "put" : "post"](url, body) .then((res) => { - console.log(res); router.push(`/development/employee-history`); }) .catch((e) => { @@ -172,9 +171,9 @@ function getDataEdit() { formMainProject.project = data.projectName; formMainProject.year = data.year; - formMainProject.trainingStartdateStart = data.dateStart; - formMainProject.trainingEnddateEnd = data.dateEnd; - formMainProject.totalTrainingtotalDate = data.totalDate; + formMainProject.trainingStart = data.dateStart; + formMainProject.trainingEnd = data.dateEnd; + formMainProject.totalTraining = data.totalDate; formMainProject.location = data.addressAcademic; formMainProject.topic = data.topicAcademic; formMainProject.studyStart = data.dateStudyStart; @@ -194,7 +193,7 @@ function getDataEdit() { onMounted(() => { if (id.value) { - getDataEdit() + getDataEdit(); } }); @@ -302,6 +301,11 @@ onMounted(() => { {{ formMainProject[field] ? formMainProject[field] + 543 : "-" }} + {{ + formMainProject[field] + ? date2Thai(formMainProject[field]) + : "-" + }} {{ formMainProject[field] ? formMainProject[field] : "-" }}