From 7065ea1a5dd69e182e85074576584e016daebd5c Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Thu, 21 Dec 2023 11:29:18 +0700 Subject: [PATCH 1/6] =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2?= =?UTF-8?q?=E0=B8=87=20component=20=E0=B8=95=E0=B8=A3=E0=B8=A7=E0=B8=88?= =?UTF-8?q?=E0=B8=AA=E0=B8=AD=E0=B8=9A=E0=B8=84=E0=B8=B8=E0=B8=93=E0=B8=AA?= =?UTF-8?q?=E0=B8=A1=E0=B8=9A=E0=B8=B1=E0=B8=95=E0=B8=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PopupCheckFeatures.vue | 183 ++++++++++++++++++-------- 1 file changed, 129 insertions(+), 54 deletions(-) diff --git a/src/components/PopupCheckFeatures.vue b/src/components/PopupCheckFeatures.vue index 8ed0d1684..d936249b5 100644 --- a/src/components/PopupCheckFeatures.vue +++ b/src/components/PopupCheckFeatures.vue @@ -18,6 +18,7 @@ const props = defineProps({ }, clickClose: { type: Function, + default: () => {}, }, type: { type: String, @@ -46,7 +47,7 @@ const rows = ref([]); const columns = ref([ { name: "degree", - align: "center", + align: "left", label: "คุณวุฒิ", sortable: false, field: "degree", @@ -55,7 +56,7 @@ const columns = ref([ }, { name: "level", - align: "left", + align: "center", label: "ระดับ", sortable: true, field: "level", @@ -76,63 +77,137 @@ const columns = ref([ ]); const visibleColumns = ref(["degree", "level", "Expert"]); +const columnsSpecial = ref([ + { + name: "degree", + align: "left", + label: "คุณวุฒิ", + sortable: false, + field: "degree", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, + { + name: "level", + align: "center", + label: "ระดับ", + sortable: true, + field: "level", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + sort: (a: string, b: string) => + a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + }, + { + name: "Special", + align: "center", + label: "ชำนาญการพิเศษ", + sortable: false, + field: "Special", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, +]); +const visibleColumnsSpecial = ref(["degree", "level", "Special"]); From e03f5a1a52e68d5070b339fb4d1742f02823d72b Mon Sep 17 00:00:00 2001 From: waruneeta Date: Thu, 21 Dec 2023 11:35:37 +0700 Subject: [PATCH 2/6] =?UTF-8?q?=E0=B8=94=E0=B8=B2=E0=B8=A7=E0=B8=99?= =?UTF-8?q?=E0=B9=8C=E0=B9=82=E0=B8=AB=E0=B8=A5=E0=B8=94=E0=B8=9F=E0=B8=AD?= =?UTF-8?q?=E0=B8=A3=E0=B9=8C=E0=B8=A1=E0=B8=A5=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/2_Leave/DetailLeave.vue | 14 ++++++++------ .../components/2_Leave/DetailLeaveReject.vue | 18 ++++++++++-------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue index c1dea856f..965f02cca 100644 --- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue +++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue @@ -525,9 +525,10 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) { ) " > - ดาวน์โหลดไฟล์ .docx + + ไฟล์ .DOCX - ดาวน์โหลดไฟล์ .pdf + + ไฟล์ .PDF diff --git a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue index efe5ed3af..642e62e69 100644 --- a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue +++ b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue @@ -462,14 +462,15 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) { @click=" onClickDownloadFile( formData.id, - formData.leaveTypeName, + 'ยกเลิก' + formData.leaveTypeName, typeDocx ) " > - ดาวน์โหลดไฟล์ .docx + + ไฟล์ .DOCX - ดาวน์โหลดไฟล์ .pdf + + ไฟล์ .PDF From 6b7e8eda4a0d43014c0b017105314adfc9275ee3 Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Thu, 21 Dec 2023 11:58:37 +0700 Subject: [PATCH 3/6] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=E0=B8=9A=E0=B8=B1=E0=B8=84=E0=B8=9B=E0=B8=A3=E0=B8=B1?= =?UTF-8?q?=E0=B8=9A=20ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit รายการคำขอประเมิน การประชุม --- .../components/Meeting/EditPage.vue | 15 ++++--- .../interface/index/meeting.ts | 4 +- .../12_evaluatePersonal/views/MainPage.vue | 43 ++++++++++++++++++- 3 files changed, 54 insertions(+), 8 deletions(-) diff --git a/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue b/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue index 2175677a7..64b9a118b 100644 --- a/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue +++ b/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue @@ -11,7 +11,9 @@ import config from "@/app.config"; import type { formData } from "@/modules/09_leave/interface/request/workTime"; const route = useRoute(); -const personalId = ref(route.params.id.toString()); +const personalId = ref(route.params.id as string); +console.log(personalId.value); + const $q = useQuasar(); const mixin = useCounterMixin(); const { @@ -21,6 +23,7 @@ const { dialogConfirm, success, date2Thai, + dateToISO, } = mixin; /**เมื่อเริ่มโหลดหน้า @@ -53,7 +56,6 @@ const fetchData = async () => { .get(config.API.meetingById(personalId.value)) .then((res) => { const dataApi = res.data.result; - personalId.value = dataApi.id; data.title = dataApi.Tittle; data.rounded = dataApi.Round; data.consider = dataApi.Result; @@ -78,16 +80,18 @@ const fetchData = async () => { */ function onSubmit(formData: FormData) { dialogConfirm($q, () => putData(formData)); + console.log(personalId.value); } function putData(formData: FormData) { + console.log(personalId.value); showLoader(); http .put(config.API.meetingById(personalId.value), { Round: formData.rounded ?? "", Tittle: formData.title, - DateStart: formData.dateMeetingStart, - DateEnd: formData.dateMeetingEnd, + DateStart: dateToISO(formData.dateMeetingStart), + DateEnd: dateToISO(formData.dateMeetingEnd), Result: formData.consider, Duration: formData.period, }) @@ -98,7 +102,8 @@ function putData(formData: FormData) { messageError($q, e); }) .finally(async () => { - router.push(`/discipline/meeting`); + hideLoader(); + router.push(`/evaluate/meeting`); }); } diff --git a/src/modules/12_evaluatePersonal/interface/index/meeting.ts b/src/modules/12_evaluatePersonal/interface/index/meeting.ts index 50f66db71..3211e7bab 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 | null; - dateMeetingEnd: Date | null; + dateMeetingStart: Date; + dateMeetingEnd: Date; consider: string; period: string; title: string; diff --git a/src/modules/12_evaluatePersonal/views/MainPage.vue b/src/modules/12_evaluatePersonal/views/MainPage.vue index 51e8d9bac..d18bcb57c 100644 --- a/src/modules/12_evaluatePersonal/views/MainPage.vue +++ b/src/modules/12_evaluatePersonal/views/MainPage.vue @@ -56,6 +56,10 @@ watch( } ); +function filterFn() { + getList(); + console.log("enter", filter.value); +} function getList() { showLoader(); http @@ -68,7 +72,9 @@ function getList() { ) .then((res) => { maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value); - const data = res.data.result; + const data = res.data.result.data; + console.log(data); + store.fetchData(data); }) .catch((e) => { @@ -92,6 +98,41 @@ onMounted(async () => { รายการคำขอประเมิน +
+ + + + + + +
Date: Thu, 21 Dec 2023 12:01:14 +0700 Subject: [PATCH 4/6] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=E0=B8=9A=E0=B8=B1=E0=B8=84=20DateEnd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../12_evaluatePersonal/components/Meeting/EditPage.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue b/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue index 64b9a118b..3fbd02c9a 100644 --- a/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue +++ b/src/modules/12_evaluatePersonal/components/Meeting/EditPage.vue @@ -61,10 +61,8 @@ const fetchData = async () => { data.consider = dataApi.Result; data.period = dataApi.Duration; data.dateMeetingStart = dataApi.DateStart; - data.dateMeetingEnd = date2Thai(dataApi.DateEnd, false, true); + data.dateMeetingEnd = dataApi.DateEnd; data.file = dataApi.file; - - console.log(data.dateMeetingStart); }) .catch((e) => { messageError($q, e); @@ -84,7 +82,6 @@ function onSubmit(formData: FormData) { } function putData(formData: FormData) { - console.log(personalId.value); showLoader(); http .put(config.API.meetingById(personalId.value), { From 28309ac2732ec1e2c14962acc1c13bc5a504c40f Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Thu, 21 Dec 2023 14:49:58 +0700 Subject: [PATCH 5/6] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=95?= =?UTF-8?q?=E0=B8=B1=E0=B8=A7=E0=B9=81=E0=B8=9B=E0=B8=A3=E0=B8=9B=E0=B8=A3?= =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/12_evaluatePersonal/store/Evaluate.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/12_evaluatePersonal/store/Evaluate.ts b/src/modules/12_evaluatePersonal/store/Evaluate.ts index 0539bbdb0..ee3004ab8 100644 --- a/src/modules/12_evaluatePersonal/store/Evaluate.ts +++ b/src/modules/12_evaluatePersonal/store/Evaluate.ts @@ -64,13 +64,13 @@ export const useEvalutuonStore = defineStore("EvalutuonStore", () => { console.log(data); const dataList: any[] = data.map((data: any) => ({ id: data.id, - citizanId: data.CitizenId, - fullName: data.FullName, - position: data.Position, - level: convertType(data.Type), - positionNumber: data.PosNo, - agency: data.Oc, - status: convertStatus(data.Step), + citizanId: data.citizenId, + fullName: data.fullName, + position: data.position, + level: convertType(data.type), + positionNumber: data.posNo, + agency: data.oc, + status: convertStatus(data.step), })); rows.value = dataList; console.log(dataList); From 38edb4b5ac5f9ee3478d88b49dc175fdcdc739a7 Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Thu, 21 Dec 2023 15:34:43 +0700 Subject: [PATCH 6/6] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=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?= =?UTF-8?q?=E0=B8=8A=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; }