diff --git a/src/modules/12_Evaluate/components/Detail/Tab2.vue b/src/modules/12_Evaluate/components/Detail/Tab2.vue deleted file mode 100644 index 1e8f6ef1b..000000000 --- a/src/modules/12_Evaluate/components/Detail/Tab2.vue +++ /dev/null @@ -1,122 +0,0 @@ - - - - - diff --git a/src/modules/12_Evaluate/components/Detail/Stepper.vue b/src/modules/12_evaluatePersonal/components/Detail/Stepper.vue similarity index 94% rename from src/modules/12_Evaluate/components/Detail/Stepper.vue rename to src/modules/12_evaluatePersonal/components/Detail/Stepper.vue index c4eecdb71..3c221f21b 100644 --- a/src/modules/12_Evaluate/components/Detail/Stepper.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/Stepper.vue @@ -1,7 +1,7 @@ diff --git a/src/modules/12_Evaluate/components/Detail/Tab1.vue b/src/modules/12_evaluatePersonal/components/Detail/Tab1.vue similarity index 67% rename from src/modules/12_Evaluate/components/Detail/Tab1.vue rename to src/modules/12_evaluatePersonal/components/Detail/Tab1.vue index 0032a2ca0..91569f9d1 100644 --- a/src/modules/12_Evaluate/components/Detail/Tab1.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/Tab1.vue @@ -2,22 +2,22 @@ import { onMounted } from "vue"; import { useQuasar } from "quasar"; -import Stepper from "@/modules/12_evaluate/components/Detail/Stepper.vue"; -import Step1 from "@/modules/12_evaluate/components/Detail/step/step1.vue"; -import Step2 from "@/modules/12_evaluate/components/Detail/step/step2.vue"; -import Step3 from "@/modules/12_evaluate/components/Detail/step/step3.vue"; -import Step4 from "@/modules/12_evaluate/components/Detail/step/step4.vue"; -import Step5 from "@/modules/12_evaluate/components/Detail/step/step5.vue"; -import Step6 from "@/modules/12_evaluate/components/Detail/step/step6.vue"; -import Step7 from "@/modules/12_evaluate/components/Detail/step/step7.vue"; -import Step8 from "@/modules/12_evaluate/components/Detail/step/step8.vue"; -import Step9 from "@/modules/12_evaluate/components/Detail/step/step9.vue"; +import Stepper from "@/modules/12_evaluatePersonal/components/Detail/Stepper.vue"; +import Step1 from "@/modules/12_evaluatePersonal/components/Detail/step/step1.vue"; +import Step2 from "@/modules/12_evaluatePersonal/components/Detail/step/step2.vue"; +import Step3 from "@/modules/12_evaluatePersonal/components/Detail/step/step3.vue"; +import Step4 from "@/modules/12_evaluatePersonal/components/Detail/step/step4.vue"; +import Step5 from "@/modules/12_evaluatePersonal/components/Detail/step/step5.vue"; +import Step6 from "@/modules/12_evaluatePersonal/components/Detail/step/step6.vue"; +import Step7 from "@/modules/12_evaluatePersonal/components/Detail/step/step7.vue"; +import Step8 from "@/modules/12_evaluatePersonal/components/Detail/step/step8.vue"; +import Step9 from "@/modules/12_evaluatePersonal/components/Detail/step/step9.vue"; -import ViewStep1 from "@/modules/12_evaluate/components/Detail/viewstep/viewStep1.vue"; -import ViewStep3 from "@/modules/12_evaluate/components/Detail/viewstep/viewStep3.vue"; -import ViewStep7 from "@/modules/12_evaluate/components/Detail/viewstep/viewStep7.vue"; +import ViewStep1 from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue"; +import ViewStep3 from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep3.vue"; +import ViewStep7 from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue"; -import { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail"; +import { useEvaluateDetailStore } from "@/modules/12_evaluatePersonal/store/EvaluateDetail"; import { useCounterMixin } from "@/stores/mixin"; const store = useEvaluateDetailStore(); @@ -67,21 +67,8 @@ onMounted(() => {
-
-
- {{ store.step }}.{{ store.titel[store.step - 1] }} -
-
-
- - ตรวจสอบคุณสมบัติกับ ก.พ. - +
+ {{ store.step }}.{{ store.titel[store.step - 1] }}
diff --git a/src/modules/12_evaluatePersonal/components/Detail/Tab2.vue b/src/modules/12_evaluatePersonal/components/Detail/Tab2.vue new file mode 100644 index 000000000..13f0e362d --- /dev/null +++ b/src/modules/12_evaluatePersonal/components/Detail/Tab2.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/src/modules/12_Evaluate/components/Detail/step/step1.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step1.vue similarity index 100% rename from src/modules/12_Evaluate/components/Detail/step/step1.vue rename to src/modules/12_evaluatePersonal/components/Detail/step/step1.vue diff --git a/src/modules/12_Evaluate/components/Detail/step/step2.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue similarity index 100% rename from src/modules/12_Evaluate/components/Detail/step/step2.vue rename to src/modules/12_evaluatePersonal/components/Detail/step/step2.vue diff --git a/src/modules/12_Evaluate/components/Detail/step/step3.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step3.vue similarity index 96% rename from src/modules/12_Evaluate/components/Detail/step/step3.vue rename to src/modules/12_evaluatePersonal/components/Detail/step/step3.vue index 6a7fe3103..200ef6d48 100644 --- a/src/modules/12_Evaluate/components/Detail/step/step3.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/step/step3.vue @@ -2,7 +2,7 @@ import { reactive, ref } from "vue"; import { useCounterMixin } from "@/stores/mixin"; -import { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail"; +import { useEvaluateDetailStore } from "@/modules/12_evaluatePersonal/store/EvaluateDetail"; const store = useEvaluateDetailStore(); const mixin = useCounterMixin(); diff --git a/src/modules/12_Evaluate/components/Detail/step/step4.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step4.vue similarity index 100% rename from src/modules/12_Evaluate/components/Detail/step/step4.vue rename to src/modules/12_evaluatePersonal/components/Detail/step/step4.vue diff --git a/src/modules/12_Evaluate/components/Detail/step/step5.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step5.vue similarity index 100% rename from src/modules/12_Evaluate/components/Detail/step/step5.vue rename to src/modules/12_evaluatePersonal/components/Detail/step/step5.vue diff --git a/src/modules/12_Evaluate/components/Detail/step/step6.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue similarity index 97% rename from src/modules/12_Evaluate/components/Detail/step/step6.vue rename to src/modules/12_evaluatePersonal/components/Detail/step/step6.vue index 909a62c5f..b1a274b66 100644 --- a/src/modules/12_Evaluate/components/Detail/step/step6.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/step/step6.vue @@ -1,6 +1,6 @@ diff --git a/src/modules/12_Evaluate/components/Detail/viewstep/viewStep7.vue b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue similarity index 60% rename from src/modules/12_Evaluate/components/Detail/viewstep/viewStep7.vue rename to src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue index 34bbf2482..abae328e2 100644 --- a/src/modules/12_Evaluate/components/Detail/viewstep/viewStep7.vue +++ b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue @@ -1,7 +1,7 @@ diff --git a/src/modules/12_Evaluate/components/Table.vue b/src/modules/12_evaluatePersonal/components/Table.vue similarity index 100% rename from src/modules/12_Evaluate/components/Table.vue rename to src/modules/12_evaluatePersonal/components/Table.vue diff --git a/src/modules/12_Evaluate/interface/index/Main.ts b/src/modules/12_evaluatePersonal/interface/index/Main.ts similarity index 100% rename from src/modules/12_Evaluate/interface/index/Main.ts rename to src/modules/12_evaluatePersonal/interface/index/Main.ts diff --git a/src/modules/12_Evaluate/router.ts b/src/modules/12_evaluatePersonal/router.ts similarity index 72% rename from src/modules/12_Evaluate/router.ts rename to src/modules/12_evaluatePersonal/router.ts index cde3765e9..376c2328d 100644 --- a/src/modules/12_Evaluate/router.ts +++ b/src/modules/12_evaluatePersonal/router.ts @@ -1,6 +1,6 @@ -const mainPage = () => import("@/modules/12_evaluate/views/MainPage.vue"); +const mainPage = () => import("@/modules/12_evaluatePersonal/views/MainPage.vue"); const detailPage = () => - import("@/modules/12_evaluate/views/DetailPage.vue"); + import("@/modules/12_evaluatePersonal/views/DetailPage.vue"); export default [ { diff --git a/src/modules/12_Evaluate/store/Evaluate.ts b/src/modules/12_evaluatePersonal/store/Evaluate.ts similarity index 99% rename from src/modules/12_Evaluate/store/Evaluate.ts rename to src/modules/12_evaluatePersonal/store/Evaluate.ts index d4637008e..f94e7d0f9 100644 --- a/src/modules/12_Evaluate/store/Evaluate.ts +++ b/src/modules/12_evaluatePersonal/store/Evaluate.ts @@ -1,7 +1,7 @@ import { defineStore } from "pinia"; import { ref } from "vue"; import type { QTableProps } from "quasar"; -import type { DataOption } from "@/modules/12_evaluate/interface/index/Main"; +import type { DataOption } from "@/modules/12_evaluatePersonal/interface/index/Main"; import { useCounterMixin } from "@/stores/mixin"; const mixin = useCounterMixin(); diff --git a/src/modules/12_Evaluate/store/EvaluateDetail.ts b/src/modules/12_evaluatePersonal/store/EvaluateDetail.ts similarity index 100% rename from src/modules/12_Evaluate/store/EvaluateDetail.ts rename to src/modules/12_evaluatePersonal/store/EvaluateDetail.ts diff --git a/src/modules/12_Evaluate/views/DetailPage.vue b/src/modules/12_evaluatePersonal/views/DetailPage.vue similarity index 73% rename from src/modules/12_Evaluate/views/DetailPage.vue rename to src/modules/12_evaluatePersonal/views/DetailPage.vue index 035686b27..12d7ebf82 100644 --- a/src/modules/12_Evaluate/views/DetailPage.vue +++ b/src/modules/12_evaluatePersonal/views/DetailPage.vue @@ -5,10 +5,10 @@ import { useRouter } from "vue-router"; import http from "@/plugins/http"; import config from "@/app.config"; -import Tab1 from "@/modules/12_evaluate/components/Detail/Tab1.vue"; // ชำนาญการ -import Tab2 from "@/modules/12_evaluate/components/Detail/Tab2.vue"; // ชำนาญการพิเศษ +import Tab1 from "@/modules/12_evaluatePersonal/components/Detail/Tab1.vue"; // ชำนาญการ +import Tab2 from "@/modules/12_evaluatePersonal/components/Detail/Tab2.vue"; // ชำนาญการพิเศษ -import { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail"; +import { useEvaluateDetailStore } from "@/modules/12_evaluatePersonal/store/EvaluateDetail"; const store = useEvaluateDetailStore(); const router = useRouter(); @@ -34,8 +34,8 @@ const $q = useQuasar(); active-bg-color="teal-1" active-class="text-primary" > - - + + diff --git a/src/modules/12_Evaluate/views/MainPage.vue b/src/modules/12_evaluatePersonal/views/MainPage.vue similarity index 98% rename from src/modules/12_Evaluate/views/MainPage.vue rename to src/modules/12_evaluatePersonal/views/MainPage.vue index cc872ed6b..830d51936 100644 --- a/src/modules/12_Evaluate/views/MainPage.vue +++ b/src/modules/12_evaluatePersonal/views/MainPage.vue @@ -5,9 +5,9 @@ import { useRouter } from "vue-router"; import http from "@/plugins/http"; import config from "@/app.config"; -import Table from "@/modules/12_evaluate/components/Table.vue"; +import Table from "@/modules/12_evaluatePersonal/components/Table.vue"; import { useCounterMixin } from "@/stores/mixin"; -import { useEvalutuonStore } from "@/modules/12_evaluate/store/Evaluate"; +import { useEvalutuonStore } from "@/modules/12_evaluatePersonal/store/Evaluate"; import type { Pagination } from "@/modules/03_recruiting/interface/index/Main"; const $q = useQuasar(); // show dialog diff --git a/src/router/index.ts b/src/router/index.ts index 2380d3533..391977edd 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -15,7 +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"; +import ModuleEvaluate from "@/modules/12_evaluatePersonal/router"; // TODO: ใช้หรือไม่? import keycloak from "@/plugins/keycloak";