diff --git a/src/components/TicketProblems.vue b/src/components/TicketProblems.vue index 105813e99..5978f4e21 100644 --- a/src/components/TicketProblems.vue +++ b/src/components/TicketProblems.vue @@ -29,14 +29,14 @@ defineProps({ row: { type: Object, required: true } }); </QTooltip> </QIcon> <QIcon - v-if="row?.risk" + v-if="row?.hasRisk" name="vn:risk" :color="row.hasHighRisk ? 'negative' : 'primary'" size="xs" > <QTooltip> {{ $t('salesTicketsTable.risk') }}: - {{ toCurrency(row.risk - row.credit) }} + {{ toCurrency(row.risk - (row.credit ?? 0)) }} </QTooltip> </QIcon> <QIcon diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue index 6740934d4..eb0804af0 100644 --- a/src/components/ui/VnNotes.vue +++ b/src/components/ui/VnNotes.vue @@ -18,12 +18,7 @@ import VnInput from 'components/common/VnInput.vue'; const emit = defineEmits(['onFetch']); -const originalAttrs = useAttrs(); - -const $attrs = computed(() => { - const { style, ...rest } = originalAttrs; - return rest; -}); +const $attrs = useAttrs(); const isRequired = computed(() => { return Object.keys($attrs).includes('required');