diff --git a/src/api/12_evaluatePersonal/api.evaluate.ts b/src/api/12_evaluatePersonal/api.evaluate.ts index 32a9b45b4..d97430957 100644 --- a/src/api/12_evaluatePersonal/api.evaluate.ts +++ b/src/api/12_evaluatePersonal/api.evaluate.ts @@ -8,6 +8,9 @@ export default { evaluationMain: (page: number, pageSize: number, keyword: string) => `${evaluation}?page=${page}&pageSize=${pageSize}&keyword=${keyword}`, + + evaluateGetDetail: (id: string) => `${evaluation}/check-spec/${id}`, + meeting: () => `${evaluation}/meeting`, meetingById: (id: string) => `${evaluation}/meeting/${id}`, meetingFilebyId: (volume: string, id: string) => @@ -15,22 +18,28 @@ export default { meetingFileDowloadbyId: (volume: string, id: string, file: string) => `${evaluation}/document/${volume}/${id}/${file}`, - evaluationFilebyId:(volume:string,id:string,file:string) => `${evaluationFile}/${volume}/${id}/${file}`, - evaluationFileListbyId:(volume:string,id:string) => `${evaluationFile}/${volume}/${id}`, - evaluationApproveDoc1:(id:string)=>`${evaluation}/doc1/approve/${id}`, + evaluationFilebyId: (volume: string, id: string, file: string) => + `${evaluationFile}/${volume}/${id}/${file}`, + evaluationFileListbyId: (volume: string, id: string) => + `${evaluationFile}/${volume}/${id}`, + evaluationApproveDoc1: (id: string) => `${evaluation}/doc1/approve/${id}`, evaluationHistory: (id: string) => `${evaluation}/step-history/${id}`, - evaluationDateAnnounce:(id:string) => `${evaluation}/check-date/${id}`, + evaluationDateAnnounce: (id: string) => `${evaluation}/check-date/${id}`, - evaluationSigner:(id:string,num:number) => `${evaluation}/doc${num}-signer/${id}`, + evaluationSigner: (id: string, num: number) => + `${evaluation}/doc${num}-signer/${id}`, - evaluationSentToContact:(id:string) => `${evaluation}/contact/user/${id}`, + evaluationSentToContact: (id: string) => `${evaluation}/contact/user/${id}`, - evaluationPatchData:(volume:string,id:string,file:string) => `${evaluationFile}/${volume}/${id}/${file}`, + evaluationPatchData: (volume: string, id: string, file: string) => + `${evaluationFile}/${volume}/${id}/${file}`, - evaluationChooseDirectors:(id:string) => `${evaluation}/choose-directors/${id}`, - evaluationChooseMeeting:(id:string) => `${evaluation}/choose-meetings/${id}`, + evaluationChooseDirectors: (id: string) => + `${evaluation}/choose-directors/${id}`, + evaluationChooseMeeting: (id: string) => + `${evaluation}/choose-meetings/${id}`, - evaluationListData:(id:string) =>`${evaluation}/director-meeting/${id}` + evaluationListData: (id: string) => `${evaluation}/director-meeting/${id}`, }; diff --git a/src/modules/12_evaluatePersonal/components/Detail/Tab1.vue b/src/modules/12_evaluatePersonal/components/Detail/Tab1.vue index e304a0b92..2be1cb4bf 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/Tab1.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/Tab1.vue @@ -35,6 +35,14 @@ const mixin = useCounterMixin(); const { dialogConfirm } = mixin; const $q = useQuasar(); + +const props = defineProps({ + data: { + type: Object, + default: {}, + }, +}); + const modalHistory = ref(false); const externalLink = "https://accreditation.ocsc.go.th/accreditation/search/curriculum"; @@ -186,7 +194,7 @@ onMounted(() => {
- ประเมินชำนาญการ + {{ props.data && props.data?.type == 'SPECIAL_EXPERT' ? 'ประเมินชำนาญการพิเศษ' : 'ประเมินชำนาญการ' }} { > - + @@ -241,7 +249,7 @@ onMounted(() => { > - + diff --git a/src/modules/12_evaluatePersonal/components/Detail/Tab2.vue b/src/modules/12_evaluatePersonal/components/Detail/Tab2.vue index fb6684477..baaa4bab5 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/Tab2.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/Tab2.vue @@ -22,9 +22,12 @@ const director = ref(); const meeting = ref(); const $q = useQuasar(); -// onMounted(() => { -// store.step = 1; -// }); +const props = defineProps({ + data: { + type: Object, + default: {}, + }, +}); function getList() { showLoader(); @@ -42,6 +45,7 @@ function getList() { hideLoader(); }); } + onMounted(() => { getList(); }); @@ -52,8 +56,8 @@ onMounted(() => {
กรรมการและการประชุม
- - + +
diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step1.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step1.vue index 0281cc05d..f5e30b3d1 100644 --- a/src/modules/12_evaluatePersonal/components/Detail/step/step1.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/step/step1.vue @@ -1,5 +1,12 @@