From 35c63aa361bd5be1d23960f214b1a10321592569 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 18 Jan 2024 12:56:28 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA=E0=B8=94?=
 =?UTF-8?q?=E0=B8=87=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EvaluateStepMain.vue           | 144 ++++++++++--------
 1 file changed, 80 insertions(+), 64 deletions(-)

diff --git a/src/modules/06_evaluate/components/EvaluateStepMain.vue b/src/modules/06_evaluate/components/EvaluateStepMain.vue
index d61fb09..4c9bd55 100644
--- a/src/modules/06_evaluate/components/EvaluateStepMain.vue
+++ b/src/modules/06_evaluate/components/EvaluateStepMain.vue
@@ -607,7 +607,7 @@ onMounted(async () => {
                     }}
                   </div>
                   <q-space />
-                  <div>
+                  <div v-if="route.name !== 'evaluate-add'">
                     <q-btn
                       flat
                       round
@@ -635,8 +635,8 @@ onMounted(async () => {
               <div class="toptitle2">
                 {{ store.step }}.{{ store.title[store.step - 1] }}
               </div>
-              <q-space/>
-              <div >
+              <q-space />
+              <div>
                 <q-btn
                   v-if="store.step === 1"
                   :href="externalLink"
@@ -651,7 +651,7 @@ onMounted(async () => {
                 </q-btn>
               </div>
             </div>
-            <div class=" col-12 q-pt-sm">
+            <div class="col-12 q-pt-sm">
               <div class="q-col-gutter-md col-12 row">
                 <div
                   :class="
@@ -664,9 +664,17 @@ onMounted(async () => {
                       ? 'col-12 row'
                       : 'col-xs-12 col-sm-5 row'
                   "
-                  
                 >
-                  <q-card flat bordered class="col-12 shadow-0" :style="$q.screen.lt.sm ? '' : 'max-height: 60vh; overflow: scroll;' ">
+                  <q-card
+                    flat
+                    bordered
+                    class="col-12 shadow-0"
+                    :style="
+                      $q.screen.lt.sm
+                        ? ''
+                        : 'max-height: 60vh; overflow: scroll;'
+                    "
+                  >
                     <Step1
                       v-if="store.step === 1"
                       @update:spec="updateCheckSpec"
@@ -677,21 +685,29 @@ onMounted(async () => {
                       v-if="store.step === 2"
                       @update:form="updateformCommand"
                     />
-                    <Step3 v-if="store.step === 3" @update:file="updateFilePDF" />
+                    <Step3
+                      v-if="store.step === 3"
+                      @update:file="updateFilePDF"
+                    />
                     <Step4 v-if="store.step === 4" />
                     <Step5 v-if="store.step === 5" />
                     <Step6
                       v-if="store.step === 6"
                       @update:form="updateformCommand"
                     />
-                    <Step7 v-if="store.step === 7" @update:file="updateFilePDF" />
+                    <Step7
+                      v-if="store.step === 7"
+                      @update:file="updateFilePDF"
+                    />
                     <Step8 v-if="store.step === 8" />
                     <Step9 v-if="store.step === 9" />
                   </q-card>
                 </div>
                 <div
                   class="col-xs-12 col-sm-7"
-                  v-if="store.step === 1 || store.step === 3 || store.step === 7"
+                  v-if="
+                    store.step === 1 || store.step === 3 || store.step === 7
+                  "
                 >
                   <div class="col-12">
                     <ViewStep1
@@ -712,63 +728,63 @@ onMounted(async () => {
                   </div>
                 </div>
               </div>
-              </div>
-              <div class="q-pt-sm q-gutter-sm" align="right">
-                <q-btn
-                  v-if="
-                    store.step >= store.currentStep &&
-                    store.statusUpload === false &&
-                    store.step !== 3 &&
-                    store.step !== 4 &&
-                    store.step !== 5 &&
-                    store.step !== 7 &&
-                    store.step !== 8 &&
-                    store.step !== 9
-                  "
-                  unelevated
-                  :label="
-                    store.step === 2 || store.step === 6
-                      ? 'บันทึกข้อมูล'
-                      : 'ดำเนินการต่อ'
-                  "
-                  color="public"
-                  @click="onCilckNextStep()"
-                />
+            </div>
+            <div class="q-pt-sm q-gutter-sm" align="right">
+              <q-btn
+                v-if="
+                  store.step >= store.currentStep &&
+                  store.statusUpload === false &&
+                  store.step !== 3 &&
+                  store.step !== 4 &&
+                  store.step !== 5 &&
+                  store.step !== 7 &&
+                  store.step !== 8 &&
+                  store.step !== 9
+                "
+                unelevated
+                :label="
+                  store.step === 2 || store.step === 6
+                    ? 'บันทึกข้อมูล'
+                    : 'ดำเนินการต่อ'
+                "
+                color="public"
+                @click="onCilckNextStep()"
+              />
 
-                <q-btn
-                  v-else-if="
-                    store.step >= store.currentStep &&
-                    (store.step == 3 || store.step == 7)
-                  "
-                  unelevated
-                  label="ยื่นเอกสาร"
-                  color="public"
-                  @click="onCilckNextStep()"
-                />
+              <q-btn
+                v-else-if="
+                  store.step >= store.currentStep &&
+                  (store.step == 3 || store.step == 7)
+                "
+                unelevated
+                label="ยื่นเอกสาร"
+                color="public"
+                @click="onCilckNextStep()"
+              />
 
-                <q-btn
-                  v-if="
-                    store.step >= store.currentStep &&
-                    store.step == 2 &&
-                    store.statusUpload
-                  "
-                  unelevated
-                  label="ดำเนินการต่อ"
-                  color="public"
-                  @click="onCilckNextStep()"
-                />
-                <q-btn
-                  v-if="
-                    store.step >= store.currentStep &&
-                    store.step == 6 &&
-                    store.statusUpload
-                  "
-                  unelevated
-                  label="ดำเนินการต่อ"
-                  color="public"
-                  @click="onCilckNextStep()"
-                />
-              </div>
+              <q-btn
+                v-if="
+                  store.step >= store.currentStep &&
+                  store.step == 2 &&
+                  store.statusUpload
+                "
+                unelevated
+                label="ดำเนินการต่อ"
+                color="public"
+                @click="onCilckNextStep()"
+              />
+              <q-btn
+                v-if="
+                  store.step >= store.currentStep &&
+                  store.step == 6 &&
+                  store.statusUpload
+                "
+                unelevated
+                label="ดำเนินการต่อ"
+                color="public"
+                @click="onCilckNextStep()"
+              />
+            </div>
           </div>
         </q-card>
       </div>