เครื่องราช

src/modules/07_insignia/views/ResultPage.vue

@@ -15,8 +15,8 @@ import type { QTableProps, QInput } from "quasar";
  * import Components
  */
 import DialogHeader from "@/components/DialogHeader.vue";
-import Dialogbody from "@/modules/07_insignia/components/3_result/Dialogbody.vue";
-import DialogForm from "@/modules/07_insignia/components/3_result/DialogForm.vue";
+import Dialogbody from "@/modules/07_insignia/components/3_result/Dialogbody.vue"; //รับ-คืนเครื่องราชฯ
+import DialogForm from "@/modules/07_insignia/components/3_result/DialogForm.vue"; //บันทึกผล
 import fileUploadview from "../components/3_result/fileUpload.vue";
 
 /**
@@ -932,27 +932,6 @@ onMounted(() => {
         <fileUploadview :roundId="selectRound" />
       </q-tab-panel>
     </q-tab-panels>
-
-    <Dialogbody
-      :modal="ModalDialog"
-      :close="close"
-      :dateCheckReceive="dateCheckReceive"
-      :dateCheckReturn="dateCheckReturn"
-      :dataModal="dataModal"
-      :personId="personId"
-      :fecthlistInsignia="fecthlistInsignia"
-    />
-
-    <DialogForm
-      :modal="modal"
-      :save="save"
-      :close="close"
-      :roundId="selectRound"
-      :action="action"
-      :personId="personId"
-      :profileType="profileType"
-      :fecthlistInsignia="fecthlistInsignia"
-    />
   </q-card>
   <q-card v-else>
     <div class="q-pa-md q-gutter-sm">
@@ -962,25 +941,32 @@ onMounted(() => {
     </div>
   </q-card>
 
+  <!-- รับ-คืนเครื่องราชฯ -->
+  <Dialogbody
+    :modal="ModalDialog"
+    :close="close"
+    :dateCheckReceive="dateCheckReceive"
+    :dateCheckReturn="dateCheckReturn"
+    :dataModal="dataModal"
+    :personId="personId"
+    :fecthlistInsignia="fecthlistInsignia"
+  />
+  <!-- DialogForm -->
+  <DialogForm
+    :modal="modal"
+    :save="save"
+    :close="close"
+    :roundId="selectRound"
+    :action="action"
+    :personId="personId"
+    :profileType="profileType"
+    :fecthlistInsignia="fecthlistInsignia"
+  />
+
+  <!-- ยืนยันรายการข้อมูล -->
   <q-dialog v-model="modelPerview">
     <q-card style="width: 850px; max-width: 80vw">
       <DialogHeader tittle="ยืนยันรายการข้อมูล" :close="closeDialogPerview" />
-      <!-- <q-card-section>
-        <q-toolbar class="q-py-md">
-          <q-toolbar-title class="header-text">
-            ยืนยันรายการข้อมูล
-          </q-toolbar-title>
-          <q-btn
-            icon="close"
-            unelevated
-            round
-            dense
-            v-close-popup
-            style="color: #ff8080; background-color: #ffdede"
-          />
-        </q-toolbar>
-      </q-card-section> -->
-
       <q-card-section class="q-pt-none">
         <d-table
           :rows="rowspreview"