From 7a0ca5bb654887ccd4f405ccf41df4189ace8e9c Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 9 Apr 2024 10:58:33 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=B4=E0=B8=94=E0=B9=84=E0=B8=A1?= =?UTF-8?q?=E0=B9=88=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B9=81=E0=B8=81=E0=B9=89?= =?UTF-8?q?=E0=B9=84=E0=B8=82=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?= =?UTF-8?q?=E0=B8=95=E0=B8=B4=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9D=E0=B8=B6?= =?UTF-8?q?=E0=B8=81=E0=B8=AD=E0=B8=9A=E0=B8=A3=E0=B8=A1=E0=B8=94=E0=B8=B9?= =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=94=E0=B8=B9=E0=B9=84=E0=B8=94?= =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=A2=E0=B9=88=E0=B8=B2=E0=B8=87=E0=B9=80?= =?UTF-8?q?=E0=B8=94=E0=B8=B5=E0=B8=A2=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/history/AddPage.vue | 51 +++++++++++-------- .../components/historyEmployee/AddPage.vue | 17 ++++--- 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/src/modules/15_development/components/history/AddPage.vue b/src/modules/15_development/components/history/AddPage.vue index 050e387ef..bad9dcaa7 100644 --- a/src/modules/15_development/components/history/AddPage.vue +++ b/src/modules/15_development/components/history/AddPage.vue @@ -22,7 +22,8 @@ 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); @@ -144,18 +145,19 @@ function upDate(data: FormAddHistory) { } function upDateProject(data: any) { -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 - + 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() { @@ -204,7 +206,7 @@ function getDataEdit() { } onMounted(() => { - if(id.value){ + if (id.value) { getDataEdit(); } }); @@ -234,14 +236,14 @@ onMounted(() => {
ข้อมูลข้าราชการฯ - + /> -->
@@ -284,14 +286,14 @@ onMounted(() => {
ข้อมูลโครงการ - + /> -->
@@ -314,7 +316,9 @@ onMounted(() => { formMainProject[field] ? formMainProject[field] + 543 : "-" }} {{ - formMainProject[field] ? date2Thai(formMainProject[field]) : "-" + formMainProject[field] + ? date2Thai(formMainProject[field]) + : "-" }} {{ formMainProject[field] ? formMainProject[field] : "-" @@ -350,6 +354,7 @@ onMounted(() => {
{
{