diff --git a/src/api/12_evaluatePersonal/api.evaluate.ts b/src/api/12_evaluatePersonal/api.evaluate.ts index 9ef8d5ea5..943eba0cf 100644 --- a/src/api/12_evaluatePersonal/api.evaluate.ts +++ b/src/api/12_evaluatePersonal/api.evaluate.ts @@ -1,8 +1,12 @@ import env from "../index"; -const evaluateDirectorMain = `${env.API_URI}/evaluate/director`; +const evaluateDirectorMain = `${env.API_URI}/evaluation/director`; +const evaluateMeetingMain = `${env.API_URI}/evaluation/meeting`; export default { evaluateDirectorMain: () => `${evaluateDirectorMain}`, evaluateDirectorById: (id:string) => `${evaluateDirectorMain}/${id}`, + + evaluateMeetingMain: () => `${evaluateMeetingMain}`, + evaluateMeetingById: (id:string) => `${evaluateMeetingMain}/${id}`, }; diff --git a/src/modules/12_evaluatePersonal/components/Director/MainPage.vue b/src/modules/12_evaluatePersonal/components/Director/MainPage.vue index a6f33c192..1b6a2df53 100644 --- a/src/modules/12_evaluatePersonal/components/Director/MainPage.vue +++ b/src/modules/12_evaluatePersonal/components/Director/MainPage.vue @@ -50,110 +50,26 @@ watch( getList(); } ); - + // currentPage.value, + // rowsPerPage.value, + // filterKeyword.value function getList() { - // showLoader(); - // http - // .get( - // config.API.evaluateDirectorMain( - // currentPage.value, - // rowsPerPage.value, - // filterKeyword.value - // ) - // ) - // .then((res) => { + showLoader(); + http + .get( + config.API.evaluateDirectorMain()) + .then((res) => { + // maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value); + const data = res.data.result + dataStore.fetchData(data); + }) + .catch((e) => { + messageError($q, e); + }) + .finally(() => { + hideLoader(); + }); - // maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value); - // const data = res.data.result.data - // dataStore.fetchData(data); - // }) - // .catch((e) => { - // messageError($q, e); - // }) - // .finally(() => { - // hideLoader(); - // }); - - // { - // "Id": "0a185476-c764-42d7-a6f9-2c3824a401ed", - // "CreatedAt": "2023-12-19T02:40:59.898Z", - // "CreatedUserId": "59134ef9-9e62-41d0-aac5-339be727f2b0", - // "LastUpdatedAt": "2023-12-19T02:40:59.898Z", - // "LastUpdateUserId": "59134ef9-9e62-41d0-aac5-339be727f2b0", - // "CreatedFullName": "สาวิตรี ศรีสมัย", - // "LastUpdateFullName": "สาวิตรี ศรีสมัย", - // "Prefix": "นาย", - // "FirstName": "เทสดี", - // "LastName": "ลองแอด", - // "Phone": "0999998767", - // "Email": "email@gmail.com", - // "Position": "frontEnd" - // } - - const data = [ - { - Id: "xx1", - CreatedAt: "2023-12-19T02:40:59.898Z", - CreatedUserId: "cc1", - LastUpdatedAt: "2023-12-19T02:40:59.898Z", - LastUpdateUserId: "ll1", - CreatedFullName: "สาวิตรี ศรีสมัย", - LastUpdateFullName: "สาวิตรี ศรีสมัย", - Prefix: "นาย", - FirstName: "เทสดี", - LastName: "ลองแอด", - Phone: "0999998767", - Email: "email@gmail.com", - Position: "frontEnd", - }, - { - Id: "xx2", - CreatedAt: "2023-12-19T02:40:59.898Z", - CreatedUserId: "cc2", - LastUpdatedAt: "2023-12-19T02:40:59.898Z", - LastUpdateUserId: "ll2", - CreatedFullName: "สาวิตรี ศรีสมัย", - LastUpdateFullName: "สาวิตรี ศรีสมัย", - Prefix: "นาย", - FirstName: "เทสดี", - LastName: "ลองแอด", - Phone: "0999998767", - Email: "email@gmail.com", - Position: "frontEnd", - }, - { - Id: "xx3", - CreatedAt: "2023-12-19T02:40:59.898Z", - CreatedUserId: "cc3", - LastUpdatedAt: "2023-12-19T02:40:59.898Z", - LastUpdateUserId: "ll3", - CreatedFullName: "สาวิตรี ศรีสมัย", - LastUpdateFullName: "สาวิตรี ศรีสมัย", - Prefix: "นาย", - FirstName: "เทสดี", - LastName: "ลองแอด", - Phone: "0999998767", - Email: "email@gmail.com", - Position: "frontEnd", - }, - { - Id: "xx4", - CreatedAt: "2023-12-19T02:40:59.898Z", - CreatedUserId: "cc5", - LastUpdatedAt: "2023-12-19T02:40:59.898Z", - LastUpdateUserId: "ll5", - CreatedFullName: "สาวิตรี ศรีสมัย", - LastUpdateFullName: "สาวิตรี ศรีสมัย", - Prefix: "นาย", - FirstName: "เทสดี", - LastName: "ลองแอด", - Phone: "0999998767", - Email: "email@gmail.com", - Position: "frontEnd", - }, - - ]; - dataStore.fetchData(data); } /** diff --git a/src/modules/12_evaluatePersonal/components/Meeting/AddPage.vue b/src/modules/12_evaluatePersonal/components/Meeting/AddPage.vue index 183dfd9c0..0d775e230 100644 --- a/src/modules/12_evaluatePersonal/components/Meeting/AddPage.vue +++ b/src/modules/12_evaluatePersonal/components/Meeting/AddPage.vue @@ -21,26 +21,27 @@ const router = useRouter(); } function addData(formData: FormDataPost) { - showLoader(); - http - .post(config.API.director(), { - personalId:formData.personalId ?? '', - prefix: formData.prefix, - firstName: formData.firstname, - lastName: formData.lastname, - position: formData.position, - email: formData.email, - phone: formData.phone, - }) - .then((res) => { - success($q, "บันทึกข้อมูลสำเร็จ"); - }) - .catch((e) => { - messageError($q, e); - }) - .finally(async () => { - router.push(`/discipline/meeting`); - }); + console.log(formData) + // showLoader(); + // http + // .post(config.API.evaluateMeetingMain(), { + // // personalId:formData.personalId ?? '', + // Prefix: formData.prefix, + // FirstName: formData.firstname, + // LastName: formData.lastname, + // Position: formData.position, + // Email: formData.email, + // Phone: formData.phone, + // }) + // .then((res) => { + // success($q, "บันทึกข้อมูลสำเร็จ"); + // }) + // .catch((e) => { + // messageError($q, e); + // }) + // .finally(async () => { + // router.push(`/discipline/meeting`); + // }); }