Merge branch 'dev' into 8612-shelvinge2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details

This commit is contained in:
PAU ROVIRA ROSALENY 2025-03-04 09:14:00 +00:00
commit e59270848b
2 changed files with 3 additions and 8 deletions

View File

@ -29,14 +29,14 @@ defineProps({ row: { type: Object, required: true } });
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon
v-if="row?.risk" v-if="row?.hasRisk"
name="vn:risk" name="vn:risk"
:color="row.hasHighRisk ? 'negative' : 'primary'" :color="row.hasHighRisk ? 'negative' : 'primary'"
size="xs" size="xs"
> >
<QTooltip> <QTooltip>
{{ $t('salesTicketsTable.risk') }}: {{ $t('salesTicketsTable.risk') }}:
{{ toCurrency(row.risk - row.credit) }} {{ toCurrency(row.risk - (row.credit ?? 0)) }}
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<QIcon <QIcon

View File

@ -18,12 +18,7 @@ import VnInput from 'components/common/VnInput.vue';
const emit = defineEmits(['onFetch']); const emit = defineEmits(['onFetch']);
const originalAttrs = useAttrs(); const $attrs = useAttrs();
const $attrs = computed(() => {
const { style, ...rest } = originalAttrs;
return rest;
});
const isRequired = computed(() => { const isRequired = computed(() => {
return Object.keys($attrs).includes('required'); return Object.keys($attrs).includes('required');