updated

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

@@ -108,8 +108,6 @@ async function onCilckNextStep() {
       ? await saveStep4
       : store.step === 5
       ? await saveStep5
-      : store.step === 5
-      ? await saveStep5
       : store.step === 7
       ? await saveStep7
       : store.step === 8
@@ -117,6 +115,7 @@ async function onCilckNextStep() {
       : store.step === 9
       ? await saveStep9
       : null;
+
   store.step === 2 || store.step === 6
     ? validateStep2()
     : store.step == 3 || store.step == 7
@@ -139,17 +138,17 @@ async function onCilckNextStep() {
       );
 }
 
-async function onCilckprPeviousStep(type: string) {
+// async function onCilckprPeviousStep(type: string) {
-  store.step < 9 &&
+//   store.step < 9 &&
-    dialogConfirm(
+//     dialogConfirm(
-      $q,
+//       $q,
-      async () => {
+//       async () => {
-        store.step--;
+//         store.step--;
-      },
+//       },
-      "ยืนยันการย้อนกลับ",
+//       "ยืนยันการย้อนกลับ",
-      "ต้องการย้อนกลับใช่หรือไม่?"
+//       "ต้องการย้อนกลับใช่หรือไม่?"
-    );
+//     );
-}
+// }
 
 async function saveStep1() {
   showLoader();

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

@@ -18,7 +18,7 @@ const props = defineProps({
   evaluateId: {
     type: String,
   },
-  educations: Array
+  educations: Array,
 });
 
 const modal = ref<boolean>(false);
@@ -62,7 +62,7 @@ async function fetchCheckSpec(id: string) {
 
 function openModal(status: boolean) {
   modal.value = true;
-  show.value = status
+  show.value = status;
 }
 
 function closeModal() {
@@ -81,6 +81,7 @@ onMounted(() => {
     <q-item v-ripple>
       <q-item-section avatar>
         <q-checkbox
+          :disable="store.currentStep > 1"
           keep-color
           color="primary"
           v-model="formData.isEducationalQft"
@@ -106,6 +107,7 @@ onMounted(() => {
     <q-item v-ripple>
       <q-item-section avatar>
         <q-checkbox
+          :disable="store.currentStep > 1"
           keep-color
           color="primary"
           v-model="formData.isGovermantServiceHtr"
@@ -119,6 +121,7 @@ onMounted(() => {
     <q-item v-ripple>
       <q-item-section avatar>
         <q-checkbox
+          :disable="store.currentStep > 1"
           keep-color
           color="primary"
           v-model="formData.isOperatingExp"
@@ -132,6 +135,7 @@ onMounted(() => {
     <q-item v-ripple>
       <q-item-section avatar>
         <q-checkbox
+          :disable="store.currentStep > 1"
           keep-color
           color="primary"
           v-model="formData.isMinPeriodOfTenure"
@@ -157,6 +161,7 @@ onMounted(() => {
     <q-item v-ripple>
       <q-item-section avatar>
         <q-checkbox
+          :disable="store.currentStep > 1"
           keep-color
           color="primary"
           v-model="formData.isHaveSpecificQft"
@@ -173,6 +178,7 @@ onMounted(() => {
     <q-item v-ripple>
       <q-item-section avatar>
         <q-checkbox
+          :disable="store.currentStep > 1"
           keep-color
           color="primary"
           v-model="formData.isHaveProLicense"
@@ -190,6 +196,7 @@ onMounted(() => {
     <q-item v-ripple>
       <q-item-section avatar>
         <q-checkbox
+          :disable="store.currentStep > 1"
           keep-color
           color="primary"
           v-model="formData.isHaveMinPeriodOrHoldPos"
@@ -206,7 +213,12 @@ onMounted(() => {
     </q-item>
   </q-list>
 
-  <PopupCheckFeatures :modal="modal" :show="show" :close-modal="closeModal" :educations="educations"/>
+  <PopupCheckFeatures
+    :modal="modal"
+    :show="show"
+    :close-modal="closeModal"
+    :educations="educations"
+  />
 </template>
 
 <style scoped></style>

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

@@ -122,15 +122,15 @@ async function fetcheSigner(id: string) {
       formCommand.commanderAboveFullname = data.commanderAboveFullnameDoc2;
       formCommand.commanderAbovePosition = data.commanderAbovePositionDoc2;
     })
-    .catch((err) => {
+    // .catch((err) => {
-      messageError($q, err);
+    //   messageError($q, err);
-    })
+    // })
     .finally(() => {
       hideLoader();
     });
 }
 
-const dateStartPrepareDoc2 = ref<string | null>(date2Thai(new Date()));
+// const dateStartPrepareDoc2 = ref<string | null>(date2Thai(new Date()));
 const dateEndPrepareDoc2 = ref<string | null>(date2Thai(new Date()));
 
 async function fetchCheckDate() {
@@ -140,12 +140,12 @@ async function fetchCheckDate() {
       .then((res) => {
         const data = res.data.result;
         // dateStartPrepareDoc2.value = date2Thai(data.dateStartPrepareDoc2);
-        const endDate = new Date(data.dateStartAnnounce);
+        const endDate = new Date(data.dateEndAnnounce);
-        endDate.setDate(endDate.getDate() + 210);
+        endDate.setDate(endDate.getDate() + 180);
         dateEndPrepareDoc2.value = date2Thai(endDate);
-        dateEndPrepareDoc2.value = data.dateEndPrepareDoc2
+        // dateEndPrepareDoc2.value = data.dateEndPrepareDoc2
-          ? date2Thai(data.dateEndPrepareDoc2)
+        //   ? date2Thai(data.dateEndPrepareDoc2)
-          : dateEndPrepareDoc2.value;
+        //   : dateEndPrepareDoc2.value;
       })
       .catch((err) => {}));
 }
@@ -165,6 +165,28 @@ onMounted(async () => {
   emit("update:form", formCommand, ref);
   // props.evaluateId && (await fetchPathUpload("เล่ม 2", props.evaluateId));
 });
+
+const downloadUrl = ref<string>("");
+function checkDoc() {
+  showLoader();
+  http
+    .get(
+      config.API.loadFileDocument("เล่ม 2", store.evaluateId, "1-เอกสารเล่ม 2")
+    )
+    .then((res: any) => {
+      downloadUrl.value = res.data.downloadUrl;
+    })
+    // .catch((e) => {
+    //   messageError($q, e);
+    // })
+    .finally(() => {
+      hideLoader();
+    });
+}
+
+onMounted(() => {
+  checkDoc();
+});
 </script>
 
 <template>
@@ -199,21 +221,23 @@ onMounted(async () => {
               </div> -->
               <div class="col-xs-12 col-sm-6 row">
                 <q-btn
-                  v-if="fileEvaluation1"
+                  v-if="downloadUrl"
+                  :href="downloadUrl"
+                  target="_blank"
                   class="col-12"
                   outline
                   icon="visibility"
                   label="ดูไฟล์เอกสาร"
                   color="primary"
-                  @click="onClickViewPDF(fileEvaluation1)"
                 >
                   <q-tooltip> ดูไฟล์เอกสาร </q-tooltip></q-btn
                 >
               </div>
               <div class="col-xs-12 col-sm-10 row">
+                <!-- :rules="[(val) => !!val || 'เลือกไฟล']" -->
+
                 <q-file
                   ref="fileEvaluation1Ref"
-                  :rules="[(val) => !!val || 'เลือกไฟล']"
                   v-model="fileEvaluation1"
                   class="col-12"
                   outlined

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

@@ -219,69 +219,57 @@ onMounted(async () => {
         <div class="col-12"><q-separator /></div>
         <div class="row">
           <div class="col-12 q-pa-sm">
-            <div
+            <div class="row q-col-gutter-md col-12">
-              v-if="store.currentStep == 8"
+              <div class="col-12">
-              class="row q-col-gutter-md col-12"
-            >
-              <div class="col-12 row">
                 <q-btn
-                  v-if="fileEvaluationEdit"
+                  v-if="downloadUrl != ''"
+                  :href="downloadUrl"
+                  target="_blank"
+                  class="col-12"
                   outline
                   icon="visibility"
                   label="ดูไฟล์เอกสาร"
                   color="primary"
-                  @click="onClickViewPDF"
                 >
                   <q-tooltip> ดูไฟล์เอกสาร </q-tooltip></q-btn
                 >
               </div>
-              <div class="col-xs-12 col-sm-10 row">
+
-                <q-file
+              <div v-if="store.currentStep == 8" class="row col-12">
-                  v-model="fileEvaluationEdit"
+                <div class="col-xs-12 col-sm-10 row">
-                  class="col-12"
+                  <q-file
-                  outlined
+                    v-model="fileEvaluationEdit"
-                  dense
+                    class="col-12"
-                  hide-bottom-space
+                    outlined
-                  lazy-rules
+                    dense
-                  accept=".pdf"
+                    hide-bottom-space
-                >
+                    lazy-rules
-                  <template v-slot:prepend>
+                    accept=".pdf"
-                    <q-icon name="attach_file" />
+                  >
-                  </template>
+                    <template v-slot:prepend>
-                </q-file>
+                      <q-icon name="attach_file" />
+                    </template>
+                  </q-file>
+                </div>
+                <div class="col-2 self-center text-center q-pl-none">
+                  <q-btn
+                    flat
+                    round
+                    dense
+                    color="primary"
+                    icon="mdi-upload"
+                    @click="
+                      fetchPathUpload(
+                        'เล่ม 2',
+                        props.evaluateId,
+                        '2-เอกสารเล่ม 2 (ฉบับแก้ไข)',
+                        fileEvaluationEdit
+                      )
+                    "
+                    ><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
+                  >
+                </div>
               </div>
-              <div class="col-2 self-center text-center q-pl-none">
-                <q-btn
-                  flat
-                  round
-                  dense
-                  color="primary"
-                  icon="mdi-upload"
-                  @click="
-                    fetchPathUpload(
-                      'เล่ม 2',
-                      props.evaluateId,
-                      '2-เอกสารเล่ม 2 (ฉบับแก้ไข)',
-                      fileEvaluationEdit
-                    )
-                  "
-                  ><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
-                >
-              </div>
-            </div>
-            <div v-else class="col-12">
-              <q-btn
-                v-if="downloadUrl != ''"
-                :href="downloadUrl"
-                target="_blank"
-                class="col-12"
-                outline
-                icon="visibility"
-                label="ดูไฟล์เอกสาร"
-                color="primary"
-              >
-                <q-tooltip> ดูไฟล์เอกสาร </q-tooltip></q-btn
-              >
             </div>
           </div>
         </div>