ui ประเมินผล

src/modules/06_evaluate/components/Tab1.vue

@@ -25,6 +25,7 @@ import ViewStep3 from "@/modules/06_evaluate/components/viewstep/viewStep3.vue";
 import ViewStep7 from "@/modules/06_evaluate/components/viewstep/viewStep7.vue";
 
 import DialogMain from "@/modules/06_evaluate/components/directorandmeet/DialogMain.vue";
+import PopupHistory from "@/modules/06_evaluate/components/viewstep/popupHistory.vue";
 
 import { useEvaluateStore } from "@/modules/06_evaluate/store";
 import { useCounterMixin } from "@/stores/mixin";
@@ -87,8 +88,6 @@ async function onCilckNextStep() {
       ? await saveStep5
       : store.step === 5
       ? await saveStep5
-      : store.step === 6
-      ? await saveStep6
       : store.step === 7
       ? await saveStep7
       : store.step === 8
@@ -96,7 +95,7 @@ async function onCilckNextStep() {
       : store.step === 9
       ? await saveStep9
       : null;
-  store.step === 2
+  store.step === 2 || store.step === 6
     ? validateStep2()
     : store.step < 9 &&
       dialogConfirm(
@@ -215,9 +214,14 @@ function fetchDirector() {
 function fetchMeeting() {
   console.log("ประเมินชำนาญการ:meeting");
 }
+const modalHistory = ref<boolean>(false);
+function onClickPopupHistory() {
+  modalHistory.value = !modalHistory.value;
+
+  console.log(modalHistory.value);
+}
 
 onMounted(async () => {
-  store.step = 1;
   await fetchCheckStatus();
 });
 </script>
@@ -225,10 +229,22 @@ onMounted(async () => {
 <template>
   <div class="row q-col-gutter-md">
     <div class="col-xs-12 col-sm-3">
-      <div class="toptitle">{{ props.title }}</div>
+      <div class="toptitle">
+        {{ props.title }}
+        <q-btn
+          flat
+          round
+          dense
+          color="primary"
+          icon="history"
+          @click="onClickPopupHistory"
+        >
+          <q-tooltip>ประวัติการประเมิน</q-tooltip>
+        </q-btn>
+      </div>
       <Stepper />
 
-      <div class="text-center">
+      <!-- <div class="text-center">
         <q-btn
           unelevated
           outline
@@ -236,7 +252,7 @@ onMounted(async () => {
           color="public"
           @click="onClickDialogDirevtor"
         />
-      </div>
+      </div> -->
     </div>
 
     <div class="col-xs-12 col-sm-9">
@@ -288,7 +304,11 @@ onMounted(async () => {
               <Step3 v-if="store.step === 3" />
               <Step4 v-if="store.step === 4" />
               <Step5 v-if="store.step === 5" />
-              <Step6 v-if="store.step === 6" />
+              <Step6
+                v-if="store.step === 6"
+                @update:form="updateformCommand"
+                :evaluateId="store.evaluateId"
+              />
               <Step7 v-if="store.step === 7" />
               <Step8 v-if="store.step === 8" />
               <Step9 v-if="store.step === 9" />
@@ -317,7 +337,13 @@ onMounted(async () => {
           @click="onCilckprPeviousStep('reject')"
         /> -->
         <q-btn
-          v-if="store.step !== 4"
+          v-if="
+            store.step >= store.currentStep &&
+            store.step !== 4 &&
+            store.step !== 5 &&
+            store.step !== 8 &&
+            store.step !== 9
+          "
           unelevated
           label="ดำเนินการต่อ"
           color="public"
@@ -333,6 +359,8 @@ onMounted(async () => {
     :fetchDirector="fetchDirector"
     :fetchMeeting="fetchMeeting"
   />
+
+  <PopupHistory :modal="modalHistory" :close="onClickPopupHistory" />
 </template>
 
 <style>