Merge branch 'develop' into devTee

# Conflicts:
#	src/api/12_evaluatePersonal/api.evaluate.ts
#	src/modules/12_evaluatePersonal/components/Meeting/AddPage.vue
#	src/modules/12_evaluatePersonal/interface/index/meeting.ts
This commit is contained in:
setthawutttty 2023-12-19 16:44:53 +07:00
commit e76953820f
5 changed files with 165 additions and 87 deletions

View file

@ -54,7 +54,7 @@ async function getList() {
showLoader();
await http
.get(
config.API.evaluateMeetingMain(
config.API.meeting(
// currentPage.value,
// rowsPerPage.value,
// filterKeyword.value
@ -88,19 +88,18 @@ function clickDelete(id: string) {
* @param id type
*/
async function deleteData(id: string) {
alert('ลบ')
// showLoader();
// await http
// .delete(config.API.directorbyId(id))
// .then((res) => {
// success($q, "");
// })
// .catch((e) => {
// messageError($q, e);
// })
// .finally(async () => {
// await getList();
// });
showLoader();
await http
.delete(config.API.meetingById(id))
.then((res) => {
success($q, "ลบข้อมูลสำเร็จ");
})
.catch((e) => {
messageError($q, e);
})
.finally(async () => {
await getList();
});
}
/**