fix folder name 12 evaluate personal

src/modules/12_Evaluate/components/Detail/Tab2.vue

@@ -1,122 +0,0 @@
-<script setup lang="ts">
-import { ref, 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 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 { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail";
-import { useCounterMixin } from "@/stores/mixin";
-
-const store = useEvaluateDetailStore();
-const mixin = useCounterMixin();
-const { dialogConfirm } = mixin;
-
-const $q = useQuasar();
-
-function onCilckNextStep() {
-  store.step < 9 &&
-    dialogConfirm($q, () => {
-      store.step++;
-    });
-}
-
-function onCilckprPeviousStep() {
-  store.step > 1 &&
-    dialogConfirm($q, () => {
-      store.step--;
-    });
-}
-
-onMounted(() => {
-  store.step = 1;
-});
-</script>
-
-<template>
-  <div class="row q-col-gutter-md">
-    <div class="col-xs-12 col-sm-3">
-      <div class="toptitle">ประเมินชำนาญการพิเศษ</div>
-      <Stepper />
-    </div>
-
-    <div class="col-xs-12 col-sm-9">
-      <div class="toptitle">
-        {{ store.step }}.{{ store.titel[store.step - 1] }}
-      </div>
-      <div class="row q-col-gutter-md col-12">
-        <div
-          :class="
-            store.step === 2 ||
-            store.step === 4 ||
-            store.step === 5 ||
-            store.step === 6 ||
-            store.step === 8 ||
-            store.step === 9
-              ? 'col-xs-12 col-sm-12 row'
-              : 'col-xs-12 col-sm-5 row'
-          "
-        >
-          <q-card flat bordered class="col-12 q-pa-md">
-            <q-card-section>
-              <Step1 v-if="store.step === 1" />
-              <Step2 v-if="store.step === 2" />
-              <Step3 v-if="store.step === 3" />
-              <Step4 v-if="store.step === 4" />
-              <Step5 v-if="store.step === 5" />
-              <Step6 v-if="store.step === 6" />
-              <Step7 v-if="store.step === 7" />
-              <Step8 v-if="store.step === 8" />
-              <Step9 v-if="store.step === 9" />
-            </q-card-section>
-          </q-card>
-        </div>
-        <div
-          class="col-xs-12 col-sm-7 row"
-          v-if="store.step === 1 || store.step === 3 || store.step === 7"
-        >
-          <q-card flat bordered class="col-12">
-            <q-card-section>
-              <ViewStep1 v-if="store.step === 1" />
-              <ViewStep3 v-if="store.step === 3" />
-              <ViewStep7 v-if="store.step === 7" /> </q-card-section
-          ></q-card>
-        </div>
-      </div>
-      <div class="q-mt-md q-gutter-md" align="right">
-        <q-btn
-          v-if="store.step !== 1"
-          unelevated
-          outline
-          label="ย้อนกลับ"
-          color="public"
-          @click="onCilckprPeviousStep"
-        />
-        <q-btn
-          unelevated
-          label="ดำเนินการต่อ"
-          color="public"
-          @click="onCilckNextStep"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<style>
-.q-stepper--vertical .q-stepper__step-inner {
-  padding: 0;
-}
-</style>

src/modules/12_evaluatePersonal/components/Detail/Stepper.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref } from "vue";
 
-import { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail";
+import { useEvaluateDetailStore } from "@/modules/12_evaluatePersonal/store/EvaluateDetail";
 
 const store = useEvaluateDetailStore();
 </script>

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 Stepper from "@/modules/12_evaluatePersonal/components/Detail/Stepper.vue";
-import Step1 from "@/modules/12_evaluate/components/Detail/step/step1.vue";
+import Step1 from "@/modules/12_evaluatePersonal/components/Detail/step/step1.vue";
-import Step2 from "@/modules/12_evaluate/components/Detail/step/step2.vue";
+import Step2 from "@/modules/12_evaluatePersonal/components/Detail/step/step2.vue";
-import Step3 from "@/modules/12_evaluate/components/Detail/step/step3.vue";
+import Step3 from "@/modules/12_evaluatePersonal/components/Detail/step/step3.vue";
-import Step4 from "@/modules/12_evaluate/components/Detail/step/step4.vue";
+import Step4 from "@/modules/12_evaluatePersonal/components/Detail/step/step4.vue";
-import Step5 from "@/modules/12_evaluate/components/Detail/step/step5.vue";
+import Step5 from "@/modules/12_evaluatePersonal/components/Detail/step/step5.vue";
-import Step6 from "@/modules/12_evaluate/components/Detail/step/step6.vue";
+import Step6 from "@/modules/12_evaluatePersonal/components/Detail/step/step6.vue";
-import Step7 from "@/modules/12_evaluate/components/Detail/step/step7.vue";
+import Step7 from "@/modules/12_evaluatePersonal/components/Detail/step/step7.vue";
-import Step8 from "@/modules/12_evaluate/components/Detail/step/step8.vue";
+import Step8 from "@/modules/12_evaluatePersonal/components/Detail/step/step8.vue";
-import Step9 from "@/modules/12_evaluate/components/Detail/step/step9.vue";
+import Step9 from "@/modules/12_evaluatePersonal/components/Detail/step/step9.vue";
 
-import ViewStep1 from "@/modules/12_evaluate/components/Detail/viewstep/viewStep1.vue";
+import ViewStep1 from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue";
-import ViewStep3 from "@/modules/12_evaluate/components/Detail/viewstep/viewStep3.vue";
+import ViewStep3 from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep3.vue";
-import ViewStep7 from "@/modules/12_evaluate/components/Detail/viewstep/viewStep7.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(() => {
 
     <div class="col-xs-12 col-sm-9">
       <div class="col-12 row">
-        <div class="col-9">
+        <div class="toptitle">
-          <div class="toptitle">
+          {{ store.step }}.{{ store.titel[store.step - 1] }}
-            {{ store.step }}.{{ store.titel[store.step - 1] }}
-          </div>
-        </div>
-        <div v-if="store.step === 1" class="col-3 text-right">
-          <q-btn
-            :href="externalLink"
-            target="_blank"
-            outline
-            color="blue"
-            no-caps
-          >
-            ตรวจสอบคุณสมบัติกับ ก.พ.
-          </q-btn>
         </div>
       </div>
       <div class="row q-col-gutter-md col-12">

src/modules/12_evaluatePersonal/components/Detail/Tab2.vue

@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import { ref, onMounted } from "vue";
+import { useQuasar } from "quasar";
+
+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_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_evaluatePersonal/store/EvaluateDetail";
+import { useCounterMixin } from "@/stores/mixin";
+
+const store = useEvaluateDetailStore();
+const mixin = useCounterMixin();
+const { dialogConfirm } = mixin;
+
+const $q = useQuasar();
+
+function onCilckNextStep() {
+  store.step < 9 &&
+    dialogConfirm($q, () => {
+      store.step++;
+    });
+}
+
+function onCilckprPeviousStep() {
+  store.step > 1 &&
+    dialogConfirm($q, () => {
+      store.step--;
+    });
+}
+
+onMounted(() => {
+  store.step = 1;
+});
+</script>
+
+<template>
+  <div class="row col-12">
+    <div class="toptitle">กรรมการและการประชุม</div>
+
+    <div class="row col-12">
+      <q-card> xx </q-card>
+    </div>
+  </div>
+</template>
+
+<style>
+.q-stepper--vertical .q-stepper__step-inner {
+  padding: 0;
+}
+</style>

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();

src/modules/12_evaluatePersonal/components/Detail/step/step6.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref } from "vue";
-import ViewPDF from "@/modules/12_evaluate/components/Detail/viewstep/viewPDF.vue";
+import ViewPDF from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewPDF.vue";
 
 const fileEvaluation1 = ref<any>();
 

src/modules/12_evaluatePersonal/components/Detail/step/step7.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();

src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { storeToRefs } from "pinia";
-import { useEvalutuonStore } from "@/modules/12_evaluate/store/Evaluate";
+import { useEvalutuonStore } from "@/modules/12_evaluatePersonal/store/Evaluate";
 
 const storageEvalutuon = useEvalutuonStore();
 const {
@@ -301,4 +301,4 @@ const {
   }
 
 </style>
-@/modules/12_evaluate/store/evaluate
+@/modules/12_evaluatePersonal/store/evaluate

src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep3.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import ViewPDF from "@/modules/12_evaluate/components/Detail/viewstep/viewPDF.vue";
+import ViewPDF from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewPDF.vue";
 
-import { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail";
+import { useEvaluateDetailStore } from "@/modules/12_evaluatePersonal/store/EvaluateDetail";
 
 const store = useEvaluateDetailStore();
 </script>

src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep7.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import ViewPDF from "@/modules/12_evaluate/components/Detail/viewstep/viewPDF.vue";
+import ViewPDF from "@/modules/12_evaluatePersonal/components/Detail/viewstep/viewPDF.vue";
 
-import { useEvaluateDetailStore } from "@/modules/12_evaluate/store/EvaluateDetail";
+import { useEvaluateDetailStore } from "@/modules/12_evaluatePersonal/store/EvaluateDetail";
 
 const store = useEvaluateDetailStore();
 </script>

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 [
   {

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();

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 Tab1 from "@/modules/12_evaluatePersonal/components/Detail/Tab1.vue"; // ชำนาญการ
-import Tab2 from "@/modules/12_evaluate/components/Detail/Tab2.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"
             >
-              <q-tab name="1" label="ชำนาญการ" />
+              <q-tab name="1" label="รายละเอียดการประเมิน" />
-              <q-tab name="2" label="ชำนาญการพิเศษ" />
+              <q-tab name="2" label="กรรมการและการประชุม" />
             </q-tabs>
             <q-separator />
             <q-tab-panels v-model="store.tabMenu" animated>

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

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";