From 38edb4b5ac5f9ee3478d88b49dc175fdcdc739a7 Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Thu, 21 Dec 2023 15:34:43 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B8=95=E0=B8=B1=E0=B8=A7=E0=B9=81=E0=B8=9B=E0=B8=A3/?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=8A?= =?UTF-8?q?=E0=B8=B8=E0=B8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Meeting/AddPage.vue | 12 ++++----- .../components/Meeting/EditPage.vue | 26 +++++++++---------- .../components/Meeting/MainPage.vue | 10 +++---- .../interface/index/meeting.ts | 4 +-- .../12_evaluatePersonal/store/MeetingStore.ts | 26 +++++++++---------- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/modules/12_evaluatePersonal/components/Meeting/AddPage.vue b/src/modules/12_evaluatePersonal/components/Meeting/AddPage.vue index f53b05e26..88cba9de5 100644 --- a/src/modules/12_evaluatePersonal/components/Meeting/AddPage.vue +++ b/src/modules/12_evaluatePersonal/components/Meeting/AddPage.vue @@ -24,12 +24,12 @@ function addData(formData: any) { showLoader(); http .post(config.API.meeting(), { - Round: formData.rounded ?? "", - Tittle: formData.title, - DateEnd: formData.dateMeetingEnd, - DateStart: formData.dateMeetingStart, - Result: formData.consider, - Duration: formData.period, + round: formData.rounded ?? "", + tittle: formData.title, + dateEnd: formData.dateMeetingEnd, + dateStart: formData.dateMeetingStart, + result: formData.consider, + duration: formData.period, }) .then((res) => { success($q, "บันทึกข้อมูลสำเร็จ"); diff --git a/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue b/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue index 3fbd02c9a..72edfc48e 100644 --- a/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue +++ b/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue @@ -56,12 +56,12 @@ const fetchData = async () => { .get(config.API.meetingById(personalId.value)) .then((res) => { const dataApi = res.data.result; - data.title = dataApi.Tittle; - data.rounded = dataApi.Round; - data.consider = dataApi.Result; - data.period = dataApi.Duration; - data.dateMeetingStart = dataApi.DateStart; - data.dateMeetingEnd = dataApi.DateEnd; + data.title = dataApi.tittle; + data.rounded = dataApi.round; + data.consider = dataApi.result; + data.period = dataApi.duration; + data.dateMeetingStart = dataApi.dateStart; + data.dateMeetingEnd = dataApi.dateEnd; data.file = dataApi.file; }) .catch((e) => { @@ -81,16 +81,16 @@ function onSubmit(formData: FormData) { console.log(personalId.value); } -function putData(formData: FormData) { +function putData(formData: any) { showLoader(); http .put(config.API.meetingById(personalId.value), { - Round: formData.rounded ?? "", - Tittle: formData.title, - DateStart: dateToISO(formData.dateMeetingStart), - DateEnd: dateToISO(formData.dateMeetingEnd), - Result: formData.consider, - Duration: formData.period, + round: formData.rounded ?? "", + tittle: formData.title, + dateStart: dateToISO(formData.dateMeetingStart), + dateEnd: dateToISO(formData.dateMeetingEnd), + result: formData.consider, + duration: formData.period, }) .then((res) => { success($q, "บันทึกข้อมูลสำเร็จ"); diff --git a/src/modules/12_evaluatePersonal/components/Meeting/MainPage.vue b/src/modules/12_evaluatePersonal/components/Meeting/MainPage.vue index 7f551eeef..a4e772adf 100644 --- a/src/modules/12_evaluatePersonal/components/Meeting/MainPage.vue +++ b/src/modules/12_evaluatePersonal/components/Meeting/MainPage.vue @@ -54,15 +54,16 @@ async function getList() { showLoader(); await http .get( - config.API.meeting( + config.API + .meeting // currentPage.value, // rowsPerPage.value, // filterKeyword.value - ) + () ) .then((res) => { // maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value); - const data = res.data.result + const data = res.data.result; dataStore.fetchData(data); }) .catch((e) => { @@ -71,8 +72,6 @@ async function getList() { .finally(() => { hideLoader(); }); - - } /** @@ -88,6 +87,7 @@ function clickDelete(id: string) { * @param id type */ async function deleteData(id: string) { + console.log(id); showLoader(); await http .delete(config.API.meetingById(id)) diff --git a/src/modules/12_evaluatePersonal/interface/index/meeting.ts b/src/modules/12_evaluatePersonal/interface/index/meeting.ts index 3211e7bab..50f66db71 100644 --- a/src/modules/12_evaluatePersonal/interface/index/meeting.ts +++ b/src/modules/12_evaluatePersonal/interface/index/meeting.ts @@ -16,8 +16,8 @@ interface MainList { interface FormData { rounded: string; dateMeeting: string; - dateMeetingStart: Date; - dateMeetingEnd: Date; + dateMeetingStart: Date | null; + dateMeetingEnd: Date | null; consider: string; period: string; title: string; diff --git a/src/modules/12_evaluatePersonal/store/MeetingStore.ts b/src/modules/12_evaluatePersonal/store/MeetingStore.ts index f03620535..3ed0d01fc 100644 --- a/src/modules/12_evaluatePersonal/store/MeetingStore.ts +++ b/src/modules/12_evaluatePersonal/store/MeetingStore.ts @@ -60,22 +60,22 @@ export const useEvaluateMeetingDataStore = defineStore( const rows = ref([]); function fetchData(data: any[]) { const dataList: any[] = data.map((item: any) => ({ - id: item.Id, - createdAt: item.CreatedAt, - createdUserId: item.CreatedUserId, - lastUpdatedAt: item.LastUpdatedAt, - lastUpdateUserId: item.LastUpdateUserId, - createdFullName: item.CreatedFullName, - lastUpdateFullName: item.LastUpdateFullName, - title: item.Tittle, - round: item.Round, - date: `${date2Thai(item.DateStart as Date, false, true)} - ${date2Thai( - item.DateEnd as Date, + id: item.id, + createdAt: item.createdAt, + createdUserId: item.createdUserId, + lastUpdatedAt: item.lastUpdatedAt, + lastUpdateUserId: item.lastUpdateUserId, + createdFullName: item.createdFullName, + lastUpdateFullName: item.lastUpdateFullName, + title: item.tittle, + round: item.round, + date: `${date2Thai(item.dateStart as Date, false, true)} - ${date2Thai( + item.dateEnd as Date, false, true )}`, - result: item.Result, - duration: item.Duration, + result: item.result, + duration: item.duration, })); rows.value = dataList; }