diff --git a/src/api/12_evaluatePersonal/api.evaluate.ts b/src/api/12_evaluatePersonal/api.evaluate.ts index 5065bc39c..32a9b45b4 100644 --- a/src/api/12_evaluatePersonal/api.evaluate.ts +++ b/src/api/12_evaluatePersonal/api.evaluate.ts @@ -1,7 +1,7 @@ import env from "../index"; const evaluateDirectorMain = `${env.API_URI}/evaluation/director`; const evaluation = `${env.API_URI}/evaluation`; -const evaluationFile = `${env.API_URI}/evaluation/document` +const evaluationFile = `${env.API_URI}/evaluation/document`; export default { evaluateDirectorMain: () => `${evaluateDirectorMain}`, evaluateDirectorById: (id: string) => `${evaluateDirectorMain}/${id}`, @@ -10,6 +10,10 @@ export default { `${evaluation}?page=${page}&pageSize=${pageSize}&keyword=${keyword}`, meeting: () => `${evaluation}/meeting`, meetingById: (id: string) => `${evaluation}/meeting/${id}`, + meetingFilebyId: (volume: string, id: string) => + `${evaluation}/document/${volume}/${id}`, + 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}`, @@ -29,5 +33,4 @@ export default { evaluationChooseMeeting:(id:string) => `${evaluation}/choose-meetings/${id}`, evaluationListData:(id:string) =>`${evaluation}/director-meeting/${id}` - }; diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts index 5b5528dd1..f72796574 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -435,13 +435,13 @@ const menuList = readonly([ }, { key: 11.3, - label: "สอบสวนความผิดวินัย", + label: "สอบสวนความผิดทางวินัย", path: "disciplineDisciplinary", role: "discipline", }, { key: 11.4, - label: "สรุปผลการพิจารณาทางวินัย", + label: "สรุปผลการพิจารณาความผิดทางวินัย", path: "disciplineResult", role: "discipline", }, @@ -459,7 +459,7 @@ const menuList = readonly([ // }, { key: 11.5, - label: "อุทธรณ์ร้องทุกข์", + label: "อุทธรณ์/ร้องทุกข์", path: "appealComplain", role: "discipline", }, diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue index d3a61bacb..59baa9447 100644 --- a/src/modules/04_registry/components/Profile.vue +++ b/src/modules/04_registry/components/Profile.vue @@ -231,7 +231,7 @@ ให้ออกจากราชการ - + item.report === false && item.isSuspend === 'NEW' && item.isSend === 'NEW' + (item: any) => item.isSuspend === "NEW" && item.isSend === "NEW" ); /** MAP รายชื่อกรรมการ หน้าหลัก */ const dataMap = props.data.director.map((item: any) => ({ @@ -645,7 +645,11 @@ onMounted(async () => { -->
{