refactor: refs #6242 modified ticket problems to display them in the same order

src/components/TicketProblems.vue

@@ -3,23 +3,6 @@ defineProps({ row: { type: Object, required: true } });
 </script>
 <template>
     <span class="q-gutter-x-xs">
-        <QIcon
-            v-if="row.isTaxDataChecked === 1"
-            name="vn:no036"
-            color="primary"
-            size="xs"
-        >
-            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.hasTicketRequest" name="vn:buyrequest" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.itemShortage" name="vn:unavailable" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
-        </QIcon>
         <QIcon
             v-if="row.risk"
             name="vn:risk"
@@ -33,13 +16,40 @@ defineProps({ row: { type: Object, required: true } });
         <QIcon v-if="row.hasComponentLack" name="vn:components" color="primary" size="xs">
             <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
+        <QIcon v-if="row?.hasItemDelay" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
+            <QTooltip>
+                {{ $t('ticket.summary.hasItemDelay') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.hasItemLost" color="primary" size="xs">
+            <QTooltip>
+                {{ $t('ticket.summary.hasItemLost') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon v-if="row.hasItemShortage" name="vn:unavailable" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
         </QIcon>
         <QIcon v-if="row.hasRounding" color="primary" name="sync_problem" size="xs">
             <QTooltip>
                 {{ $t('ticketList.rounding') }}
             </QTooltip>
         </QIcon>
+        <QIcon v-if="row.hasTicketRequest" name="vn:buyrequest" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row.isTaxDataChecked === 1"
+            name="vn:no036"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
+        </QIcon>
     </span>
 </template>

src/pages/Ticket/Card/TicketDescriptor.vue

@@ -163,49 +163,21 @@ function ticketFilter(ticket) {
             <VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" />
             <VnLv :label="t('globals.alias')" :value="entity.nickname" />
         </template>
-        <template #icons="{ entity }">
+        <template #icons>
             <QCardActions class="q-gutter-x-xs">
-                <QIcon
-                    v-if="entity.client.isActive == false"
-                    name="vn:disabled"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('Client inactive') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="entity.client.isFreezed == true"
-                    name="vn:frozen"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('Client Frozen') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="entity?.problem?.includes('hasRisk')"
-                    name="vn:risk"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('Client has debt') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="entity.client.isTaxDataChecked == false"
-                    name="vn:no036"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('Client not checked') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="entity.isDeleted == true"
-                    name="vn:deletedTicket"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('This ticket is deleted') }}</QTooltip>
-                </QIcon>
                 <div v-for="problem in problems" :key="problem" class="q-gutter-x-xs">
+                    <QIcon
+                        v-show="problem?.risk"
+                        name="vn:risk"
+                        :color="problem?.hasHighRisk ? 'negative' : 'primary'"
+                        size="xs"
+                    >
+                        <QTooltip
+                            >{{ t('salesTicketsTable.risk') }}:
+                            {{ console.log('risk, credit', row?.risk, row?.credit) }}
+                            {{ row?.risk - row?.credit }}</QTooltip
+                        >
+                    </QIcon>
                     <QIcon
                         v-if="problem?.hasComponentLack"
                         color="primary"
@@ -216,16 +188,6 @@ function ticketFilter(ticket) {
                             {{ t('ticket.summary.hasComponentLack') }}
                         </QTooltip>
                     </QIcon>
-                    <QIcon
-                        v-show="problem?.risk"
-                        name="vn:risk"
-                        :color="problem?.hasHighRisk ? 'negative' : 'primary'"
-                        size="xs"
-                    >
-                        <QTooltip
-                            >{{ $t('salesTicketsTable.risk') }}: {{ row.risk }}</QTooltip
-                        >
-                    </QIcon>
                     <QIcon v-if="problem?.hasItemDelay" color="primary" size="xs">
                         <QTooltip>
                             {{ t('ticket.summary.hasItemDelay') }}
@@ -266,6 +228,14 @@ function ticketFilter(ticket) {
                             {{ t('ticket.summary.hasTicketRequest') }}
                         </QTooltip>
                     </QIcon>
+                    <QIcon
+                        v-show="problem.isTaxDataChecked"
+                        name="vn:no036"
+                        size="xs"
+                        color="primary"
+                    >
+                        <QTooltip>{{ t('Client not checked') }}</QTooltip>
+                    </QIcon>
                     <QIcon
                         v-if="problem.isFreezed"
                         name="vn:frozen"
@@ -275,12 +245,12 @@ function ticketFilter(ticket) {
                         <QTooltip>{{ t('Client Frozen') }}</QTooltip>
                     </QIcon>
                     <QIcon
-                        v-show="problem.isTaxDataChecked"
+                        v-if="problem.isTooLittle"
-                        name="vn:no036"
+                        name="vn:isTooLittle"
-                        size="xs"
                         color="primary"
+                        size="xs"
                     >
-                        <QTooltip>{{ t('Client not checked') }}</QTooltip>
+                        <QTooltip>{{ t('salesTicketsTable.tooLittle') }}</QTooltip>
                     </QIcon>
                 </div>
             </QCardActions>