ย้าย ไอคอน ข้อมูลหลัก

src/modules/01_metadata/components/position-employee/01ListPosition.vue

@@ -332,6 +332,7 @@ onMounted(() => {
     >
       <template v-slot:header="props">
         <q-tr :props="props">
+          <q-th auto-width></q-th>
           <q-th
             v-for="col in props.cols"
             :key="col.name"
@@ -340,20 +341,10 @@ onMounted(() => {
           >
             <span class="text-weight-medium">{{ col.label }}</span>
           </q-th>
-          <q-th auto-width></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">
-            <div v-if="col.name == 'no'">
-              {{ props.rowIndex + 1 }}
-            </div>
-
-            <div v-else>
-              {{ col.value ? col.value : "-" }}
-            </div>
-          </q-td>
           <q-td auto-width>
             <q-btn
               color="blue-6"
@@ -399,6 +390,16 @@ onMounted(() => {
               <q-tooltip>ลบข้อมูล</q-tooltip>
             </q-btn>
           </q-td>
+          <q-td v-for="col in props.cols" :key="col.name" :props="props">
+            <div v-if="col.name == 'no'">
+              {{ props.rowIndex + 1 }}
+            </div>
+
+            <div v-else>
+              {{ col.value ? col.value : "-" }}
+            </div>
+          </q-td>
+
         </q-tr>
       </template>
     </d-table>

src/modules/01_metadata/components/position-employee/02ListType.vue

@@ -244,10 +244,10 @@ 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>
     </template>
     <template v-slot:body="props">
@@ -256,9 +256,6 @@ onMounted(() => {
         class="cursor-pointer"
         @click.stop="onClickDetail(props.row.id)"
       >
-        <q-td v-for="col in props.cols" :key="col.id">
-          {{ col.value ? col.value : "-" }}
-        </q-td>
         <q-td auto-width>
           <q-btn
             color="edit"
@@ -285,6 +282,9 @@ onMounted(() => {
             <q-tooltip>ลบข้อมูล</q-tooltip>
           </q-btn> -->
         </q-td>
+        <q-td v-for="col in props.cols" :key="col.id">
+          {{ col.value ? col.value : "-" }}
+        </q-td>
       </q-tr>
     </template>
   </d-table>
@@ -318,7 +318,6 @@ onMounted(() => {
               :rules="[(val) => val.length > 0 || 'กรุณากรอกชื่อกลุ่มงาน']"
               hide-bottom-space
               class="inputgreen"
-
             />
           </div>
 
@@ -334,7 +333,6 @@ onMounted(() => {
               hide-bottom-space
               :rules="[(val) => !!val || `${'กรุณากรอกอักษรย่อกลุ่มงาน'}`]"
               class="inputgreen"
-
             />
           </div>
 
@@ -353,7 +351,6 @@ onMounted(() => {
               hide-bottom-space
               mask="############"
               class="inputgreen"
-
             />
           </div>
         </q-card-section>

src/modules/01_metadata/components/position-employee/03ListLevel.vue

@@ -275,25 +275,14 @@ 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-bold">{{ 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 v-for="(col, index) in props.cols" :key="col.id">
-              <div v-if="col.name == 'no'">
-                {{ props.rowIndex + 1 }}
-              </div>
-              <div v-else-if="col.name === 'posLevelAuthority'">
-                {{ col.value ? convertPosLevelAuthority(col.value) : "-" }}
-              </div>
-              <div v-else>
-                {{ col.value }}
-              </div>
-            </q-td>
             <q-td auto-width>
               <q-btn
                 color="edit"
@@ -319,6 +308,18 @@ onMounted(() => {
                 <q-tooltip>ลบข้อมูล</q-tooltip>
               </q-btn> -->
             </q-td>
+            <q-td v-for="(col, index) in props.cols" :key="col.id">
+              <div v-if="col.name == 'no'">
+                {{ props.rowIndex + 1 }}
+              </div>
+              <div v-else-if="col.name === 'posLevelAuthority'">
+                {{ col.value ? convertPosLevelAuthority(col.value) : "-" }}
+              </div>
+              <div v-else>
+                {{ col.value }}
+              </div>
+            </q-td>
+
           </q-tr>
         </template>
       </d-table>