no message
This commit is contained in:
setthawutttty
parent
d8d824019f
commit
8788a08d18
6 changed files with 108 additions and 202 deletions
|
|
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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`);
|
||||
// });
|
||||
}
|
||||
</script>
|
||||
<template>
|
||||
|
|
|
|||
|
|
@ -51,66 +51,28 @@ watch(
|
|||
}
|
||||
);
|
||||
async function getList() {
|
||||
// showLoader();
|
||||
// await http
|
||||
// .get(
|
||||
// config.API.directorList(
|
||||
// currentPage.value,
|
||||
// rowsPerPage.value,
|
||||
// filterKeyword.value
|
||||
// )
|
||||
// )
|
||||
// .then((res) => {
|
||||
// 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();
|
||||
// });
|
||||
showLoader();
|
||||
await http
|
||||
.get(
|
||||
config.API.evaluateMeetingMain(
|
||||
// currentPage.value,
|
||||
// rowsPerPage.value,
|
||||
// filterKeyword.value
|
||||
)
|
||||
)
|
||||
.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();
|
||||
});
|
||||
|
||||
|
||||
/** จำลองข้อมูล */
|
||||
const data = [
|
||||
{
|
||||
id: "08dbf276-47d1-446b-8c0a-c109030dd457",
|
||||
rounded:'1',
|
||||
title:'ประชุม 1',
|
||||
dateStart:new Date('2023-12-18T10:12:29.362007'),
|
||||
dateEnd:new Date('2023-12-18T10:12:29.362007'),
|
||||
},
|
||||
{
|
||||
id: "08dbf633-a4e4-49f6-8278-7105ce82e158",
|
||||
rounded:'2',
|
||||
title:'ประชุม 2',
|
||||
dateStart:new Date('2023-12-18T10:12:29.362007'),
|
||||
dateEnd:new Date('2023-12-18T10:12:29.362007'),
|
||||
},
|
||||
{
|
||||
id: "08dbf67d-ebfa-4216-8bdb-4668351513b8",
|
||||
rounded:'3',
|
||||
title:'ประชุม 3',
|
||||
dateStart:new Date('2023-12-18T10:12:29.362007'),
|
||||
dateEnd:new Date('2023-12-18T10:12:29.362007'),
|
||||
},
|
||||
{
|
||||
id: "08dbf6dd-7cff-4dd1-89d3-4fe0533ee186",
|
||||
rounded:'4',
|
||||
title:'ประชุม 4',
|
||||
dateStart:new Date('2023-12-18T10:12:29.362007'),
|
||||
dateEnd:new Date('2023-12-18T10:12:29.362007'),
|
||||
},
|
||||
{
|
||||
id: "08dbfd41-0567-447f-8d3f-3254166c815d",
|
||||
rounded:'5',
|
||||
title:'ประชุม 5',
|
||||
dateStart:new Date('2023-12-18T10:12:29.362007'),
|
||||
dateEnd:new Date('2023-12-18T10:12:29.362007'),
|
||||
},
|
||||
];
|
||||
dataStore.fetchData(data);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,16 +1,31 @@
|
|||
interface DataResponseList {
|
||||
id: string
|
||||
rounded: string
|
||||
title: string
|
||||
dateStart: Date
|
||||
dateEnd: Date
|
||||
Id:string
|
||||
CreatedAt:string
|
||||
CreatedUserId:string
|
||||
LastUpdatedAt:string
|
||||
LastUpdateUserId:string
|
||||
CreatedFullName:string
|
||||
LastUpdateFullName:string
|
||||
Tittle:string
|
||||
Round:string
|
||||
Date:string
|
||||
Result:string
|
||||
Duration:string
|
||||
}
|
||||
|
||||
interface MainList {
|
||||
id: string
|
||||
rounded: string
|
||||
title: string
|
||||
date: string
|
||||
id:string
|
||||
createdAt:string
|
||||
createdUserId:string
|
||||
lastUpdatedAt:string
|
||||
lastUpdateUserId:string
|
||||
createdFullName:string
|
||||
lastUpdateFullName:string
|
||||
tittle:string
|
||||
round:string
|
||||
date:string
|
||||
result:string
|
||||
duration:string
|
||||
}
|
||||
|
||||
interface FormData {
|
||||
|
|
@ -21,10 +36,10 @@ interface FormData {
|
|||
file: FileOj[]
|
||||
}
|
||||
|
||||
interface FileOj{
|
||||
id:string
|
||||
pathName:string
|
||||
fileName:string
|
||||
interface FileOj {
|
||||
id: string
|
||||
pathName: string
|
||||
fileName: string
|
||||
}
|
||||
|
||||
interface FormRef {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ export const useEvaluateMeetingDataStore = defineStore(
|
|||
//ค้นหา คอลัมน์ คอลัมน์ที่แสดง
|
||||
const visibleColumns = ref<string[]>([
|
||||
"no",
|
||||
"rounded",
|
||||
"round",
|
||||
"title",
|
||||
"date",
|
||||
]);
|
||||
|
|
@ -30,11 +30,11 @@ export const useEvaluateMeetingDataStore = defineStore(
|
|||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "rounded",
|
||||
name: "round",
|
||||
align: "left",
|
||||
label: "ครั้งที่",
|
||||
sortable: true,
|
||||
field: "rounded",
|
||||
field: "round",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
|
|
@ -62,10 +62,18 @@ export const useEvaluateMeetingDataStore = defineStore(
|
|||
const rows = ref<MainList[]>([]);
|
||||
function fetchData(data: DataResponseList[]) {
|
||||
const dataList: MainList[] = data.map((item: DataResponseList) => ({
|
||||
id: item.id,
|
||||
rounded: item.rounded,
|
||||
title: item.title,
|
||||
date: `${date2Thai(item.dateStart as Date)} - ${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.Date as Date),
|
||||
result:item.Result,
|
||||
duration:item.Duration,
|
||||
}))
|
||||
rows.value = dataList
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue