diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts index 1f82f9d08..19306ff1b 100644 --- a/src/api/02_organizational/api.organization.ts +++ b/src/api/02_organizational/api.organization.ts @@ -1,6 +1,6 @@ import env from "../index"; -const organization = `${env.API_URI}/organization`; +const organization = `${env.API_URI}/org`; export default { /** โครงสร้างอัตรากำลัง*/ diff --git a/src/modules/02_organizationalNew/components/DialogHistory.vue b/src/modules/02_organizationalNew/components/DialogHistory.vue index f036d55e0..90d2a0dfb 100644 --- a/src/modules/02_organizationalNew/components/DialogHistory.vue +++ b/src/modules/02_organizationalNew/components/DialogHistory.vue @@ -87,46 +87,46 @@ const visibleColumns = ref([ ]); function getDate() { - const dataDraft: HistoryType[] = [ - { - orgRevisionId: "00000000-0000-0000-0000-000000000000", - orgRevisionName: "xxxx", - orgRevisionIsCurrent: true, - orgRevisionIsDraft: false, - orgRevisionCreatedAt: date2Thai(new Date(),false,true), - }, - { - orgRevisionId: "00000000-0000-0000-0000-000000000001", - orgRevisionName: "xxx1", - orgRevisionIsCurrent: false, - orgRevisionIsDraft: true, - orgRevisionCreatedAt: date2Thai(new Date(),false,true), - }, - ]; - rows.value = dataDraft; + // const dataDraft: HistoryType[] = [ + // { + // orgRevisionId: "00000000-0000-0000-0000-000000000000", + // orgRevisionName: "xxxx", + // orgRevisionIsCurrent: true, + // orgRevisionIsDraft: false, + // orgRevisionCreatedAt: date2Thai(new Date(),false,true), + // }, + // { + // orgRevisionId: "00000000-0000-0000-0000-000000000001", + // orgRevisionName: "xxx1", + // orgRevisionIsCurrent: false, + // orgRevisionIsDraft: true, + // orgRevisionCreatedAt: date2Thai(new Date(),false,true), + // }, + // ]; + // rows.value = dataDraft; // รอ API - // showLoader() - // http - // .get(config.API.organizationHistoryNew) - // .then((res)=>{ - // const dataList = res.data.result - // dataList.map((item:HistoryType)=>( - // { - // orgRevisionId:item.orgRevisionId ? item.orgRevisionId:'-', - // orgRevisionName:item.orgRevisionName ? item.orgRevisionName:'-', - // orgRevisionIsCurrent:item.orgRevisionIsCurrent ? item.orgRevisionIsCurrent:'-', - // orgRevisionIsDraft:item.orgRevisionIsDraft ? item.orgRevisionIsDraft:'-', - // orgRevisionCreatedAt:item.orgRevisionCreatedAt ? date2Thai(item.orgRevisionCreatedAt):'-', - // } - // )) - // rows.value = dataList - // }).catch((e)=>{ - // messageError($q,e) - // }) - // .finally(()=>{ - // hideLoader() - // }) + showLoader() + http + .get(config.API.organizationHistoryNew) + .then((res)=>{ + const dataList = res.data.result + dataList.map((item:HistoryType)=>( + { + orgRevisionId:item.orgRevisionId ? item.orgRevisionId:'-', + orgRevisionName:item.orgRevisionName ? item.orgRevisionName:'-', + orgRevisionIsCurrent:item.orgRevisionIsCurrent ? item.orgRevisionIsCurrent:'-', + orgRevisionIsDraft:item.orgRevisionIsDraft ? item.orgRevisionIsDraft:'-', + orgRevisionCreatedAt:item.orgRevisionCreatedAt ? date2Thai(item.orgRevisionCreatedAt):'-', + } + )) + rows.value = dataList + }).catch((e)=>{ + messageError($q,e) + }) + .finally(()=>{ + hideLoader() + }) } watch( () => props.modal,