Merge pull request '#7317: Deleted warnings' (!1261) from 7317-SupplierWarnings into dev
gitea/salix-front/pipeline/head Build queued...
Details
gitea/salix-front/pipeline/head Build queued...
Details
Reviewed-on: #1261 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
9c50079bfc
|
@ -202,7 +202,7 @@ const columns = computed(() => [
|
|||
prop.row.id,
|
||||
$props.downloadModel,
|
||||
undefined,
|
||||
prop.row.download
|
||||
prop.row.download,
|
||||
),
|
||||
},
|
||||
{
|
||||
|
@ -374,7 +374,7 @@ defineExpose({
|
|||
v-if="
|
||||
shouldRenderButton(
|
||||
button.name,
|
||||
props.row.isDocuware
|
||||
props.row.isDocuware,
|
||||
)
|
||||
"
|
||||
:is="button.component"
|
||||
|
|
|
@ -9,9 +9,9 @@ const $props = defineProps({
|
|||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
hasInfo: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
info: {
|
||||
type: String,
|
||||
default: undefined,
|
||||
},
|
||||
modelValue: {
|
||||
type: [String, Number, Object],
|
||||
|
@ -57,9 +57,9 @@ const url = computed(() => {
|
|||
<template #prepend v-if="$props.hasAvatar">
|
||||
<VnAvatar :worker-id="value" color="primary" v-bind="$attrs" />
|
||||
</template>
|
||||
<template #append v-if="$props.hasInfo">
|
||||
<template #append v-if="$props.info">
|
||||
<QIcon name="info" class="cursor-pointer">
|
||||
<QTooltip>{{ $t($props.hasInfo) }}</QTooltip>
|
||||
<QTooltip>{{ $t($props.info) }}</QTooltip>
|
||||
</QIcon>
|
||||
</template>
|
||||
<template #option="scope">
|
||||
|
|
|
@ -36,7 +36,7 @@ const companySizes = [
|
|||
/>
|
||||
<VnSelectWorker
|
||||
v-model="data.workerFk"
|
||||
has-info="Responsible for approving invoices"
|
||||
info="Responsible for approving invoices"
|
||||
:rules="validate('supplier.workerFk')"
|
||||
/>
|
||||
<VnSelect
|
||||
|
|
|
@ -94,7 +94,7 @@ function handleLocation(data, location) {
|
|||
<VnInput
|
||||
v-model="data.name"
|
||||
:label="t('supplier.fiscalData.name')"
|
||||
uppercase="true"
|
||||
:uppercase="true"
|
||||
clearable
|
||||
/>
|
||||
<VnInput
|
||||
|
|
Loading…
Reference in New Issue