ย้ายไอคอน

src/modules/10_order/components/step/step02.vue

@@ -506,20 +506,17 @@ const resetFilter = () => {
       >
         <template v-slot:header="props">
           <q-tr :props="props">
-            <q-th v-for="col in props.cols" :key="col.name" :props="props">
-              <span class="text-weight-medium">{{ col.label }}</span>
-            </q-th>
             <q-th auto-width />
             <q-th auto-width />
             <q-th auto-width />
             <q-th auto-width v-if="statuscode !== true" />
+            <q-th v-for="col in props.cols" :key="col.name" :props="props">
+              <span class="text-weight-medium">{{ col.label }}</span>
+            </q-th>
           </q-tr>
         </template>
         <template v-slot:body="props">
           <q-tr :props="props" class="cursor-pointer">
-            <q-td v-for="col in props.cols" :key="col.name" :props="props">{{
-              col.name == "no" ? props.rowIndex + 1 : col.value
-            }}</q-td>
             <q-td auto-width>
               <q-btn
                 dense
@@ -588,6 +585,9 @@ const resetFilter = () => {
                 <q-tooltip>ลบข้อมูล</q-tooltip>
               </q-btn>
             </q-td>
+            <q-td v-for="col in props.cols" :key="col.name" :props="props">{{
+              col.name == "no" ? props.rowIndex + 1 : col.value
+            }}</q-td>
           </q-tr>
         </template>
       </d-table>

src/modules/10_order/components/step/step03.vue

@@ -419,14 +419,28 @@ const fetchOrder = async (id: string) => {
         >
           <template v-slot:header="props">
             <q-tr :props="props">
+              <q-th auto-width />
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
                 <span class="text-weight-medium">{{ col.label }}</span>
               </q-th>
-              <q-th auto-width />
             </q-tr>
           </template>
           <template v-slot:body="props">
             <q-tr :props="props" class="cursor-pointer">
+              <q-td auto-width>
+                <q-btn
+                  dense
+                  size="12px"
+                  flat
+                  round
+                  color="red"
+                  @click="clickDelete(props.row.personalId)"
+                  icon="mdi-delete"
+                >
+                  <q-tooltip>ลบข้อมูล</q-tooltip>
+                </q-btn>
+              </q-td>
+
               <q-td key="no" :props="props">
                 {{ props.rowIndex + 1 }}
               </q-td>
@@ -474,19 +488,6 @@ const fetchOrder = async (id: string) => {
                   </template>
                 </q-select>
               </q-td>
-              <q-td auto-width>
-                <q-btn
-                  dense
-                  size="12px"
-                  flat
-                  round
-                  color="red"
-                  @click="clickDelete(props.row.personalId)"
-                  icon="mdi-delete"
-                >
-                  <q-tooltip>ลบข้อมูล</q-tooltip>
-                </q-btn>
-              </q-td>
             </q-tr>
           </template>
         </d-table>