diff --git a/src/api/12_evaluatePersonal/api.evaluate.ts b/src/api/12_evaluatePersonal/api.evaluate.ts index 6215b5ac2..23cead14b 100644 --- a/src/api/12_evaluatePersonal/api.evaluate.ts +++ b/src/api/12_evaluatePersonal/api.evaluate.ts @@ -6,8 +6,7 @@ export default { evaluateDirectorMain: () => `${evaluateDirectorMain}`, evaluateDirectorById: (id: string) => `${evaluateDirectorMain}/${id}`, - evaluationMain: (page: number, pageSize: number, keyword: string) => - `${evaluation}?page=${page}&pageSize=${pageSize}&keyword=${keyword}`, + evaluationMain: () => `${evaluation}`, evaluateGetDetail: (id: string) => `${evaluation}/check-spec/${id}`, evaluateGetStep: (id: string) => `${evaluation}/check/${id}`, @@ -26,7 +25,7 @@ export default { evaluationApproveDoc1: (id: string) => `${evaluation}/doc1/approve/${id}`, evaluationNext5To6: (id: string) => `${evaluation}/announce/${id}`, evaluationNextFinish: (id: string) => `${evaluation}/wait-check-doc-v2/${id}`, - + evaluationHistory: (id: string) => `${evaluation}/step-history/${id}`, evaluationDateAnnounce: (id: string) => `${evaluation}/check-date/${id}`, diff --git a/src/modules/12_evaluatePersonal/interface/index/Main.ts b/src/modules/12_evaluatePersonal/interface/index/Main.ts index f3ecb355b..1c0e74bac 100644 --- a/src/modules/12_evaluatePersonal/interface/index/Main.ts +++ b/src/modules/12_evaluatePersonal/interface/index/Main.ts @@ -1,86 +1,91 @@ interface DataOption { - id: string; - name: string; - } - interface DataOptionYear { - id: number; - name: string; - } - interface DataOptioGroup { - id: string; - name: string; - - disable: Boolean; - } - - interface DataNumberOption { - id: number; - name: string; - } - - interface InvestigatefactsDataRowType { - id: string; - title: string; - respondentType: string; - offenseDetails: string; - investigationDetail: string; - dateInvestigate: string; - investigationStatusResult: string; - status: string; - } - - interface investigateDisDataRowType { - id: string; //id รายการ - title: string; //เรื่องร้องเรียน - interrogated: string; //ผู้ถูกสอบสวน - descMistake: string; //ลักษณะความผิด - mistakeLevel: string; //ระดับโทษความผิด - mistakeCase: string; //กรณีความผิด - investigationDate: Date | null; //วันที่สอบสวน - status: string | null; //สถานะ - isResultConfirmed: Boolean; //ยืนยันผลเเล้ว/ยังไม่ได้ยืนยันผล - } - - interface directorType { - id: string; - directorId?: string; - prefix: string; - firstName: string; - lastName: string; - position: string; - email: string; - phone: string; - total?: number; - duty?: string; - } - interface responseType { - id: string; - directorId?: string; - prefix: string; - firstName: string; - lastName: string; - position: string; - email: string; - phone: string; - total?: number; - duty?: string; - - } - - interface FileLists { - id: string; //id เอกสาร - fileName: string; //ชื่่อเอกสาร - pathName: string; //link file - } - - export type { - DataOption, - InvestigatefactsDataRowType, - investigateDisDataRowType, - directorType, - DataNumberOption, - responseType, - FileLists, - DataOptioGroup, - DataOptionYear, - }; \ No newline at end of file + id: string; + name: string; +} +interface DataOptionYear { + id: number; + name: string; +} +interface DataOptioGroup { + id: string; + name: string; + + disable: Boolean; +} + +interface OptionStatus { + val: string; + label: string; +} + +interface DataNumberOption { + id: number; + name: string; +} + +interface InvestigatefactsDataRowType { + id: string; + title: string; + respondentType: string; + offenseDetails: string; + investigationDetail: string; + dateInvestigate: string; + investigationStatusResult: string; + status: string; +} + +interface investigateDisDataRowType { + id: string; //id รายการ + title: string; //เรื่องร้องเรียน + interrogated: string; //ผู้ถูกสอบสวน + descMistake: string; //ลักษณะความผิด + mistakeLevel: string; //ระดับโทษความผิด + mistakeCase: string; //กรณีความผิด + investigationDate: Date | null; //วันที่สอบสวน + status: string | null; //สถานะ + isResultConfirmed: Boolean; //ยืนยันผลเเล้ว/ยังไม่ได้ยืนยันผล +} + +interface directorType { + id: string; + directorId?: string; + prefix: string; + firstName: string; + lastName: string; + position: string; + email: string; + phone: string; + total?: number; + duty?: string; +} +interface responseType { + id: string; + directorId?: string; + prefix: string; + firstName: string; + lastName: string; + position: string; + email: string; + phone: string; + total?: number; + duty?: string; +} + +interface FileLists { + id: string; //id เอกสาร + fileName: string; //ชื่่อเอกสาร + pathName: string; //link file +} + +export type { + DataOption, + InvestigatefactsDataRowType, + investigateDisDataRowType, + directorType, + DataNumberOption, + responseType, + FileLists, + DataOptioGroup, + DataOptionYear, + OptionStatus, +}; diff --git a/src/modules/12_evaluatePersonal/views/MainPage.vue b/src/modules/12_evaluatePersonal/views/MainPage.vue index 75c2ee633..6ed97eb9b 100644 --- a/src/modules/12_evaluatePersonal/views/MainPage.vue +++ b/src/modules/12_evaluatePersonal/views/MainPage.vue @@ -1,10 +1,12 @@