diff --git a/src/modules/08_registryEmployee/views/information.vue b/src/modules/08_registryEmployee/views/information.vue index ce2f3c9ed..964556bf1 100644 --- a/src/modules/08_registryEmployee/views/information.vue +++ b/src/modules/08_registryEmployee/views/information.vue @@ -97,7 +97,7 @@ autoApply :enableTimePicker="false" week-start="0" - :max-date="new Date()" + :max-date="calculateMaxDate()" :disabled="!edit" @update:model-value="handleDate" > @@ -1020,8 +1020,14 @@ const fetchDataComponent = async (modelData: Date) => { await props.fetchDataProfile(); await fetchData(); }; - +const calculateMaxDate = () => { + const today = new Date(); + + today.setDate(today.getDate() - 1); + return today; + } const calRetire = async (birth: Date) => { + console.log(birth) const body = { birthDate: dateToISO(birth), }; diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue index 6f573b28d..fbffd5e59 100644 --- a/src/views/Dashboard.vue +++ b/src/views/Dashboard.vue @@ -91,13 +91,13 @@ const getData = async () => { let list: DataInbox[] = []; response.map((e: ResponseInbox) => { list.push({ - no: e.id ?? "", + no: e.receiverUserId ?? "", sender: e.createdFullName == "" || e.createdFullName == null ? "เจ้าหน้าที่" : e.createdFullName, subject: e.subject ?? "", - timereceive: new Date(e.createdAt), + timereceive: new Date(e.receiveDate), body: e.body ?? "", payload: e.payload, ratingModel: 0, @@ -199,7 +199,7 @@ await http /> -->