ย้ายไอคอน

src/modules/13_salary/components/salaryEmployeeChart/TabCriteria.vue

@@ -379,40 +379,15 @@ onMounted(() => {
   >
     <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>
       <q-separator />
     </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">
-          <div v-if="col.name === 'no'">
-            {{
-              (formFilter.page - 1) * Number(pagination.rowsPerPage) +
-              props.rowIndex +
-              1
-            }}
-          </div>
-          <div
-            v-else-if="
-              col.name == 'rateOldMin' ||
-              col.name == 'rateMaxOld' ||
-              col.name == 'rateHighMax'
-            "
-          >
-            {{ col.value ? col.value.toLocaleString() : "-" }}
-          </div>
-          <div v-else-if="col.name == 'groupOld'">
-            <span v-for="(item, index) in col.value">
-              {{ item }}{{ index + 1 == col.value.length ? "" : "," }}
-            </span>
-          </div>
-          <div v-else>{{ col.value != "" ? col.value : "-" }}</div>
-        </q-td>
-
         <q-td>
           <q-btn
             flat
@@ -448,6 +423,32 @@ onMounted(() => {
             </q-menu>
           </q-btn>
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.name" :props="props">
+          <div v-if="col.name === 'no'">
+            {{
+              (formFilter.page - 1) * Number(pagination.rowsPerPage) +
+              props.rowIndex +
+              1
+            }}
+          </div>
+          <div
+            v-else-if="
+              col.name == 'rateOldMin' ||
+              col.name == 'rateMaxOld' ||
+              col.name == 'rateHighMax'
+            "
+          >
+            {{ col.value ? col.value.toLocaleString() : "-" }}
+          </div>
+          <div v-else-if="col.name == 'groupOld'">
+            <span v-for="(item, index) in col.value">
+              {{ item }}{{ index + 1 == col.value.length ? "" : "," }}
+            </span>
+          </div>
+          <div v-else>{{ col.value != "" ? col.value : "-" }}</div>
+        </q-td>
+
+
       </q-tr>
     </template>
     <template v-slot:pagination="scope">

src/modules/13_salary/components/salaryEmployeeChart/TabStructure.vue

@@ -319,31 +319,15 @@ onMounted(() => {
   >
     <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>
       <q-separator />
     </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">
-          <div v-if="col.name === 'startDate'">
-            {{ col.value ? date2Thai(col.value) : "-" }}
-          </div>
-          <div v-else-if="col.name === 'group'">
-            {{ col.value ? `กลุ่มที่ ${col.value}` : "-" }}
-          </div>
-          <div v-else-if="col.name === 'isActive'">
-            <q-icon
-              :name="col.value ? 'done' : 'close'"
-              :color="col.value ? 'primary' : 'grey'"
-              size="24px"
-            ></q-icon>
-          </div>
-          <div v-else>{{ col.value ? col.value : "-" }}</div>
-        </q-td>
         <q-td>
           <q-btn
             flat
@@ -390,6 +374,23 @@ onMounted(() => {
             </q-menu>
           </q-btn>
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.name" :props="props">
+          <div v-if="col.name === 'startDate'">
+            {{ col.value ? date2Thai(col.value) : "-" }}
+          </div>
+          <div v-else-if="col.name === 'group'">
+            {{ col.value ? `กลุ่มที่ ${col.value}` : "-" }}
+          </div>
+          <div v-else-if="col.name === 'isActive'">
+            <q-icon
+              :name="col.value ? 'done' : 'close'"
+              :color="col.value ? 'primary' : 'grey'"
+              size="24px"
+            ></q-icon>
+          </div>
+          <div v-else>{{ col.value ? col.value : "-" }}</div>
+        </q-td>
+
       </q-tr>
     </template>
     <template v-slot:pagination="scope">