fix bug evaluate

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

@@ -107,7 +107,7 @@ async function validateForm() {
         nextTostep3();
       }
     } else {
-      if (store.statusUpload === false) {
+      if (store.statusUpload6 === false) {
         saveStep6();
       } else {
         nextTostep7();
@@ -458,6 +458,7 @@ async function nextTostep3() {
         )
         .then(() => {
           route.params.id && fetchCheckStep(route.params.id.toString());
+          store.statusUpload = false;
         })
         .catch((err) => {
           messageError($q, err);
@@ -500,6 +501,7 @@ async function saveStep6() {
     subjectDoc2: formCommand.subject,
     assignedPosition: formCommand.assignedPosition,
   };
+
   dialogConfirm(
     $q,
     async () => {

src/modules/06_evaluate/components/step/step6.vue

@@ -152,10 +152,10 @@ async function fetcheSigner(id: string) {
       formCommand.subject = data.subjectDoc2;
       formCommand.assignedPosition = data.assignedPosition;
 
-      store.statusUpload = true;
+      store.statusUpload6 = data.commanderFullnameDoc2 === null ? false : true;
     })
     .catch(() => {
-      store.statusUpload = false;
+      store.statusUpload6 = false;
       getCommander();
     })
     .finally(() => {
@@ -234,10 +234,10 @@ watch(
   }
 );
 watch(
-  () => store.statusUpload,
+  () => store.statusUpload6,
   () => {
     setTimeout(() => {
-      store.statusUpload && updateInput(formCommand);
+      store.statusUpload6 && updateInput(formCommand);
     }, 200);
   }
 );
@@ -249,7 +249,7 @@ onMounted(async () => {
     formCommand.author = user.name;
   }
   checkDoc();
-  if (store.currentStep > 2) {
+  if (store.currentStep >= 6) {
     fetcheSigner(evaluateId.value);
   }
   await fetchCheckDate();
@@ -433,7 +433,7 @@ onMounted(async () => {
               <div class="row q-col-gutter-sm col-12">
                 <div class="col-12">
                   <q-file
-                    :disable="!store.statusUpload"
+                    :disable="!store.statusUpload6"
                     ref="fileEvaluation1Ref"
                     v-model="fileEvaluation1"
                     class="col-12"
@@ -455,7 +455,7 @@ onMounted(async () => {
                     <template v-slot:after>
                       <div>
                         <q-btn
-                          :disable="!store.statusUpload"
+                          :disable="!store.statusUpload6"
                           round
                           dense
                           flat

src/modules/06_evaluate/store.ts

@@ -42,6 +42,8 @@ export const useEvaluateStore = defineStore("evaluateStore", () => {
   const step = ref<number>(1);
   const currentStep = ref<number>(1);
   const statusUpload = ref<boolean>(false);
+  const statusUpload6 = ref<boolean>(false);
+
   const title = ref<string[]>([
     "ตรวจสอบคุณสมบัติ",
     "จัดเตรียมเอกสารเล่ม 1",
@@ -100,5 +102,6 @@ export const useEvaluateStore = defineStore("evaluateStore", () => {
     tabPanels,
     evaluateId,
     showLoadStatus,
+    statusUpload6,
   };
 });