feat: refs #6321 merge icon column

src/pages/Ticket/Negative/TicketLackTable.vue

@@ -10,6 +10,7 @@ import { useRoute } from 'vue-router';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import TicketDescriptorProxy from '../Card/TicketDescriptorProxy.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const $props = defineProps({
     filter: {
@@ -87,15 +88,6 @@ const rowColor = (row) => {
 //     return 'white';
 // };
 const columns = computed(() => [
-    {
-        label: '',
-        name: 'totalProblems',
-        align: 'left',
-        columnFilter: false,
-        attrs: {
-            dense: true,
-        },
-    },
     // {
     //     align: 'left',
     //     label: t('negative.detail.isBasket'),
@@ -264,22 +256,55 @@ function onTicketLackFetched(data) {
         :right-search="false"
         v-model:selected="selectedRows"
     >
-        <template #column-totalProblems>
+        <template #column-status="{ row }">
-            {{}}
+            <QTd style="width: 150px">
-            <!-- <pre> {{ props }}</pre> -->
+                <!-- <pre> {{ props }}</pre> -->
-            <!-- v-if="!props.row.isBasket" -->
+                <!-- v-if="!props.row.isBasket" -->
-            <QIcon name="vn:basket" color="primary" size="sm">
+                <QIcon name="vn:basket" color="primary" class="cursor-pointer" size="xs">
-                <QTooltip>{{ t('negative.detail.isBasket') }}</QTooltip>
+                    <QTooltip>{{ t('negative.detail.isBasket') }}</QTooltip>
-            </QIcon>
+                </QIcon>
-            <!-- v-if="!props.row.hasToIgnore" -->
+                <!-- v-if="!props.row.hasToIgnore" -->
-            <QIcon name="star" color="primary" size="sm">
+                <QIcon name="star" color="primary" class="cursor-pointer" size="xs">
-                <QTooltip>{{ t('negative.detail.hasToIgnore') }}</QTooltip>
+                    <QTooltip>{{ t('negative.detail.hasToIgnore') }}</QTooltip>
-            </QIcon>
+                </QIcon>
-            <!-- v-if="!props.row.hasSubstitution" -->
+                <!-- v-if="!props.row.hasSubstitution" -->
-            <QIcon name="change_circle" color="primary" size="sm">
+                <QIcon
-                <QTooltip>{{ t('negative.detail.hasSubstitution') }}</QTooltip>
+                    name="change_circle"
-            </QIcon>
+                    color="primary"
+                    class="cursor-pointer"
+                    size="xs"
+                >
+                    <QTooltip>{{
+                        t('negative.detail.hasSubstitution')
+                    }}</QTooltip> </QIcon
+                ><QIcon name="vn:Person" size="xs" color="primary" class="cursor-pointer">
+                    <QTooltip>{{ t('negative.detail.isRookie') }}</QTooltip>
+                </QIcon>
+                <QIcon
+                    name="vn:buyrequest"
+                    size="xs"
+                    color="primary"
+                    class="cursor-pointer"
+                >
+                    <QTooltip>{{ t('negative.detail.peticionCompra') }}</QTooltip>
+                </QIcon>
+                <QIcon
+                    name="vn:calendar"
+                    size="xs"
+                    color="primary"
+                    class="cursor-pointer"
+                >
+                    <QTooltip>{{ t('negative.detail.turno') }}</QTooltip>
+                </QIcon></QTd
+            >
         </template>
+
+        <template #column-ticketFk="{ row }">
+            <QBadge class="q-pa-sm" :color="rowColor(row)">
+                {{ row.ticketFk }}
+            </QBadge>
+            <TicketDescriptorProxy :id="row.ticketFk"
+        /></template>
         <template #column-alertLevelCode="props">
             <VnSelect
                 :options="editableStates"
@@ -290,53 +315,17 @@ function onTicketLackFetched(data) {
                 v-on="getInputEvents(props)"
             />
         </template>
+
+        <template #column-zoneName="{ row }">
+            <span class="link">{{ row.zoneName }}</span>
+            <ZoneDescriptorProxy :id="row.zoneFk" />
+        </template>
         <template #column-quantity="props">
             <VnInputNumber
                 v-model.number="props.row.quantity"
                 v-on="getInputEvents(props)"
             ></VnInputNumber>
         </template>
-        <template #column-status="{ row }">
-            <QTd style="width: 150px">
-                <QIcon
-                    v-if="row.isRookie"
-                    name="vn:person"
-                    size="xs"
-                    color="primary"
-                    class="cursor-pointer"
-                >
-                    <QTooltip>{{ t('negative.detail.isRookie') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.peticionCompra"
-                    name="vn:buyrequest"
-                    size="xs"
-                    color="primary"
-                    class="cursor-pointer"
-                >
-                    <QTooltip>{{ t('negative.detail.peticionCompra') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.turno"
-                    name="vn:calendar"
-                    size="xs"
-                    color="primary"
-                    class="cursor-pointer"
-                >
-                    <QTooltip>{{ t('negative.detail.turno') }}</QTooltip>
-                </QIcon></QTd
-            >
-        </template>
-        <template #column-ticketFk="{ row }">
-            <QBadge class="q-pa-sm" :color="rowColor(row)">
-                {{ row.ticketFk }}
-            </QBadge>
-            <TicketDescriptorProxy :id="row.ticketFk"
-        /></template>
-        <template #column-zoneName="{ row }">
-            <span class="link">{{ row.zoneName }}</span>
-            <ZoneDescriptorProxy :id="row.zoneFk" />
-        </template>
     </VnTable>
 </template>
 <style lang="scss" scoped>