forked from verdnatura/salix-front
Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation
This commit is contained in:
commit
79a34db700
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { ref, onMounted, computed, watch, useAttrs } from 'vue';
|
||||
import { ref, onMounted, computed, watch } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
import { useQuasar } from 'quasar';
|
||||
|
@ -60,7 +60,6 @@ const $props = defineProps({
|
|||
default: false,
|
||||
},
|
||||
});
|
||||
const attrs = useAttrs();
|
||||
const { t } = useI18n();
|
||||
const stateStore = useStateStore();
|
||||
const route = useRoute();
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
v-if="toComponent?.component"
|
||||
:is="mix(toComponent).component"
|
||||
v-bind="mix(toComponent).attrs"
|
||||
v-on="mix(toComponent).event"
|
||||
v-on="mix(toComponent).event ?? {}"
|
||||
v-model="model"
|
||||
/>
|
||||
</span>
|
||||
|
@ -21,12 +21,10 @@ const $props = defineProps({
|
|||
components: {
|
||||
type: Object,
|
||||
default: () => {},
|
||||
required: false,
|
||||
},
|
||||
value: {
|
||||
type: Object,
|
||||
type: [Object, Number, String],
|
||||
default: () => {},
|
||||
required: false,
|
||||
},
|
||||
});
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { ref, computed, onMounted } from 'vue';
|
||||
import { ref, computed, markRaw } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useRouter } from 'vue-router';
|
||||
import VnTable from 'components/VnTable/VnTable.vue';
|
||||
|
@ -10,7 +10,6 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
|
|||
import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
|
||||
|
||||
import { toDate } from 'src/filters';
|
||||
import RightMenu from 'src/components/common/RightMenu.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
const router = useRouter();
|
||||
|
@ -96,7 +95,7 @@ const columns = computed(() => [
|
|||
name: 'phone',
|
||||
cardVisible: true,
|
||||
after: {
|
||||
component: VnLinkPhone,
|
||||
component: markRaw(VnLinkPhone),
|
||||
props: (prop) => ({
|
||||
'phone-number': prop.phone,
|
||||
}),
|
||||
|
|
Loading…
Reference in New Issue