ย้ายไอคอน

src/modules/03_recruiting/components/Career.vue

@@ -17,23 +17,10 @@
       :editData="status == 'checkRegister' || status == 'payment'"
       name="ประวัติการทำงาน (ตั้งแต่เริ่มปฏิบัติงานกับกรุงเทพมหานคร - ปัจจุบัน)"
       icon="mdi-briefcase"
+      :iconLeft="true"
     >
       <template #columns="props">
         <q-tr :props="props">
-          <q-td
-            v-for="col in props.cols"
-            :key="col.name"
-            :props="props"
-            @click="selectData(props)"
-            class="cursor-pointer"
-          >
-            <div v-if="col.name == 'startDate' || col.name == 'endDate'">
-              {{ date2Thai(col.value) }}
-            </div>
-            <div v-else>
-              {{ col.value }}
-            </div>
-          </q-td>
           <q-td
             style="width: 5% !important"
             v-if="status == 'checkRegister' || status == 'payment'"
@@ -48,6 +35,20 @@
               @click="checkDelete(props.row)"
             />
           </q-td>
+          <q-td
+            v-for="col in props.cols"
+            :key="col.name"
+            :props="props"
+            @click="selectData(props)"
+            class="cursor-pointer"
+          >
+            <div v-if="col.name == 'startDate' || col.name == 'endDate'">
+              {{ date2Thai(col.value) }}
+            </div>
+            <div v-else>
+              {{ col.value }}
+            </div>
+          </q-td>
         </q-tr>
       </template>
       <template #bottom="props">

src/modules/03_recruiting/components/Table.vue

@@ -111,10 +111,10 @@
   >
     <template v-slot:header="props">
       <q-tr :props="props">
+        <q-th auto-width v-if="nornmalData == true" />
         <q-th v-for="col in props.cols" :key="col.name" :props="props">
           <span class="text-weight-medium" v-html="col.label" />
         </q-th>
-        <q-th auto-width v-if="nornmalData == true" />
       </q-tr>
     </template>
     <template #body="props">

src/modules/03_recruiting/components/Table1.vue

@@ -72,10 +72,10 @@
       <q-tr :props="props">
         <q-th auto-width v-if="name === 'ตำแหน่ง/เงินเดือน'" />
         <q-th auto-width v-if="name === 'ตำแหน่ง/เงินเดือน'" />
+        <q-th auto-width v-if="iconLeft == 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-th auto-width v-if="name !== 'การลา'" />
         <q-th auto-width v-if="name === 'ประวัติการเปลี่ยนชื่อ-นามสกุล'" />
       </q-tr>
     </template>
@@ -115,6 +115,9 @@ const props = defineProps({
     type: Boolean,
     required: true,
   },
+  iconLeft: {
+    type: Boolean,
+  },
   edit: {
     type: Function,
     default: () => console.log("not function"),

src/modules/03_recruiting/components/TableCan.vue

@@ -68,10 +68,11 @@
   >
     <template v-slot:header="props">
       <q-tr :props="props">
+        <q-th auto-width v-if="boss == 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-th auto-width v-if="boss == true" />
+
       </q-tr>
     </template>
     <template #body="props">
@@ -97,6 +98,7 @@ const initialPagination = ref<Pagination>({
 
 const props = defineProps({
   inputfilter: String,
+  iconLeft: Boolean,
   name: String,
   icon: String,
   inputvisible: Array,