From 24adce7fa8ebd3db4621f515a87ec85fc1f71417 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Thu, 14 Dec 2023 12:23:34 +0700 Subject: [PATCH] =?UTF-8?q?-=20router=20=E0=B8=9B=E0=B8=A3=E0=B8=B0?= =?UTF-8?q?=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99=E0=B8=9A=E0=B8=B8=E0=B8=84?= =?UTF-8?q?=E0=B8=84=E0=B8=A5=20-=20=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=A3=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B9=80=E0=B8=AD=E0=B8=B5=E0=B8=A2=E0=B8=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/interface/request/main/main.ts | 2 +- .../12_Evaluate/components/Detail/Stepper.vue | 73 +++ .../12_Evaluate/components/Detail/Tab1.vue | 132 +++++ .../12_Evaluate/components/Detail/Tab2.vue | 122 +++++ .../components/Detail/step/step1.vue | 117 +++++ .../components/Detail/step/step2.vue | 483 ++++++++++++++++++ .../components/Detail/step/step3.vue | 80 +++ .../components/Detail/step/step4.vue | 22 + .../components/Detail/step/step5.vue | 26 + .../components/Detail/step/step6.vue | 106 ++++ .../components/Detail/step/step7.vue | 33 ++ .../components/Detail/step/step8.vue | 22 + .../components/Detail/step/step9.vue | 22 + .../components/Detail/viewstep/viewPDF.vue | 180 +++++++ .../components/Detail/viewstep/viewStep1.vue | 7 + .../components/Detail/viewstep/viewStep3.vue | 34 ++ .../components/Detail/viewstep/viewStep7.vue | 17 + .../12_Evaluate/components/DetailPage.vue | 0 .../12_Evaluate/interface/index/Main.ts | 87 +--- src/modules/12_Evaluate/router.ts | 21 +- .../12_Evaluate/store/EvaluateDetail.ts | 28 + src/modules/12_Evaluate/views/DetailPage.vue | 51 ++ .../12_Evaluate/{ => views}/MainPage.vue | 0 src/router/index.ts | 4 +- 24 files changed, 1571 insertions(+), 98 deletions(-) create mode 100644 src/modules/12_Evaluate/components/Detail/Stepper.vue create mode 100644 src/modules/12_Evaluate/components/Detail/Tab1.vue create mode 100644 src/modules/12_Evaluate/components/Detail/Tab2.vue create mode 100644 src/modules/12_Evaluate/components/Detail/step/step1.vue create mode 100644 src/modules/12_Evaluate/components/Detail/step/step2.vue create mode 100644 src/modules/12_Evaluate/components/Detail/step/step3.vue create mode 100644 src/modules/12_Evaluate/components/Detail/step/step4.vue create mode 100644 src/modules/12_Evaluate/components/Detail/step/step5.vue create mode 100644 src/modules/12_Evaluate/components/Detail/step/step6.vue create mode 100644 src/modules/12_Evaluate/components/Detail/step/step7.vue create mode 100644 src/modules/12_Evaluate/components/Detail/step/step8.vue create mode 100644 src/modules/12_Evaluate/components/Detail/step/step9.vue create mode 100644 src/modules/12_Evaluate/components/Detail/viewstep/viewPDF.vue create mode 100644 src/modules/12_Evaluate/components/Detail/viewstep/viewStep1.vue create mode 100644 src/modules/12_Evaluate/components/Detail/viewstep/viewStep3.vue create mode 100644 src/modules/12_Evaluate/components/Detail/viewstep/viewStep7.vue delete mode 100644 src/modules/12_Evaluate/components/DetailPage.vue create mode 100644 src/modules/12_Evaluate/store/EvaluateDetail.ts create mode 100644 src/modules/12_Evaluate/views/DetailPage.vue rename src/modules/12_Evaluate/{ => views}/MainPage.vue (100%) diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts index 16fc0106a..f03753da2 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -489,7 +489,7 @@ const menuList = readonly([ activeIcon: "evaluate", label: "ประเมินบุคคล", path: "evaluate", - role: "order", // evaluate + role: "discipline", // evaluate }, ]); diff --git a/src/modules/12_Evaluate/components/Detail/Stepper.vue b/src/modules/12_Evaluate/components/Detail/Stepper.vue new file mode 100644 index 000000000..c4eecdb71 --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/Stepper.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/Tab1.vue b/src/modules/12_Evaluate/components/Detail/Tab1.vue new file mode 100644 index 000000000..630d9e1f9 --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/Tab1.vue @@ -0,0 +1,132 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/Tab2.vue b/src/modules/12_Evaluate/components/Detail/Tab2.vue new file mode 100644 index 000000000..1e8f6ef1b --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/Tab2.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/step/step1.vue b/src/modules/12_Evaluate/components/Detail/step/step1.vue new file mode 100644 index 000000000..0281cc05d --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/step/step1.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/step/step2.vue b/src/modules/12_Evaluate/components/Detail/step/step2.vue new file mode 100644 index 000000000..3da70da2a --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/step/step2.vue @@ -0,0 +1,483 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/step/step3.vue b/src/modules/12_Evaluate/components/Detail/step/step3.vue new file mode 100644 index 000000000..6a7fe3103 --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/step/step3.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/step/step4.vue b/src/modules/12_Evaluate/components/Detail/step/step4.vue new file mode 100644 index 000000000..d5522c0cd --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/step/step4.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/step/step5.vue b/src/modules/12_Evaluate/components/Detail/step/step5.vue new file mode 100644 index 000000000..4caf80f55 --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/step/step5.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/step/step6.vue b/src/modules/12_Evaluate/components/Detail/step/step6.vue new file mode 100644 index 000000000..909a62c5f --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/step/step6.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/step/step7.vue b/src/modules/12_Evaluate/components/Detail/step/step7.vue new file mode 100644 index 000000000..547aa84cf --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/step/step7.vue @@ -0,0 +1,33 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/step/step8.vue b/src/modules/12_Evaluate/components/Detail/step/step8.vue new file mode 100644 index 000000000..e2416f325 --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/step/step8.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/step/step9.vue b/src/modules/12_Evaluate/components/Detail/step/step9.vue new file mode 100644 index 000000000..cb2c3f36b --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/step/step9.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/viewstep/viewPDF.vue b/src/modules/12_Evaluate/components/Detail/viewstep/viewPDF.vue new file mode 100644 index 000000000..81faa83cb --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/viewstep/viewPDF.vue @@ -0,0 +1,180 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/viewstep/viewStep1.vue b/src/modules/12_Evaluate/components/Detail/viewstep/viewStep1.vue new file mode 100644 index 000000000..9c84ddb58 --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/viewstep/viewStep1.vue @@ -0,0 +1,7 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/viewstep/viewStep3.vue b/src/modules/12_Evaluate/components/Detail/viewstep/viewStep3.vue new file mode 100644 index 000000000..fca3e2a02 --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/viewstep/viewStep3.vue @@ -0,0 +1,34 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/viewstep/viewStep7.vue b/src/modules/12_Evaluate/components/Detail/viewstep/viewStep7.vue new file mode 100644 index 000000000..34bbf2482 --- /dev/null +++ b/src/modules/12_Evaluate/components/Detail/viewstep/viewStep7.vue @@ -0,0 +1,17 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/DetailPage.vue b/src/modules/12_Evaluate/components/DetailPage.vue deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/modules/12_Evaluate/interface/index/Main.ts b/src/modules/12_Evaluate/interface/index/Main.ts index 15bf08932..e4ea7770c 100644 --- a/src/modules/12_Evaluate/interface/index/Main.ts +++ b/src/modules/12_Evaluate/interface/index/Main.ts @@ -1,86 +1 @@ -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, -}; +export type {}; diff --git a/src/modules/12_Evaluate/router.ts b/src/modules/12_Evaluate/router.ts index 48ee1c3f8..cde3765e9 100644 --- a/src/modules/12_Evaluate/router.ts +++ b/src/modules/12_Evaluate/router.ts @@ -1,25 +1,26 @@ -const Evaluate = () => import("@/modules/12_Evaluate/MainPage.vue"); -const EvaluateDetail = () => - import("@/modules/12_Evaluate/components/DetailPage.vue"); +const mainPage = () => import("@/modules/12_evaluate/views/MainPage.vue"); +const detailPage = () => + import("@/modules/12_evaluate/views/DetailPage.vue"); + export default [ { path: "/evaluate", name: "evaluate", - component: Evaluate, + component: mainPage, meta: { Auth: true, - Key: [12], - Role: "evaluate", + Key: [1.1], + Role: "discipline", }, }, { path: "/evaluate/detail", name: "evaluateDetail", - component: EvaluateDetail, + component: detailPage, meta: { Auth: true, - Key: [12.1], - Role: "evaluate", + Key: [12.2], + Role: "discipline", }, }, -]; +]; \ No newline at end of file diff --git a/src/modules/12_Evaluate/store/EvaluateDetail.ts b/src/modules/12_Evaluate/store/EvaluateDetail.ts new file mode 100644 index 000000000..0940a9c5e --- /dev/null +++ b/src/modules/12_Evaluate/store/EvaluateDetail.ts @@ -0,0 +1,28 @@ + +import { defineStore } from "pinia"; +import { ref } from "vue"; + +export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => { + const tabMenu = ref("1"); + const step = ref(1); + const titel = ref([ + "ตรวจสอบคุณสมบัติ", + "จัดเตรียมเอกสาร", + "ตรวจสอบเอกสาร", + "รอตรวจสอบคุณสมบัติ", + "ประกาศบนเว็บไซต์", + "จัดเตรียมเอกสารเล่ม 2", + "ตรวจสอบเอกสารเล่ม 2", + "รอพิจารณาผล", + "เสร็จสิ้น", + ]); + + const tabPanels = ref("1"); + + return { + tabMenu, + step, + titel, + tabPanels, + }; +}); \ No newline at end of file diff --git a/src/modules/12_Evaluate/views/DetailPage.vue b/src/modules/12_Evaluate/views/DetailPage.vue new file mode 100644 index 000000000..035686b27 --- /dev/null +++ b/src/modules/12_Evaluate/views/DetailPage.vue @@ -0,0 +1,51 @@ + + + diff --git a/src/modules/12_Evaluate/MainPage.vue b/src/modules/12_Evaluate/views/MainPage.vue similarity index 100% rename from src/modules/12_Evaluate/MainPage.vue rename to src/modules/12_Evaluate/views/MainPage.vue diff --git a/src/router/index.ts b/src/router/index.ts index effe76e05..af85ba9a4 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -15,6 +15,7 @@ import ModuleRegistryEmployee from "@/modules/08_registryEmployee/router"; import ModuleOrder from "@/modules/10_order/router"; import ModuleLeave from "@/modules/09_leave/router"; import ModuleDiscipline from "@/modules/11_discipline/router" +import ModuleEvaluate from "@/modules/12_evaluate/router" // TODO: ใช้หรือไม่? import keycloak from "@/plugins/keycloak"; @@ -47,7 +48,8 @@ const router = createRouter({ ...ModuleRegistryEmployee, ...ModuleOrder, ...ModuleLeave, - ...ModuleDiscipline + ...ModuleDiscipline, + ...ModuleEvaluate ], }, /**