diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue index 3e430865c..a06592002 100644 --- a/src/components/VnTable/VnColumn.vue +++ b/src/components/VnTable/VnColumn.vue @@ -11,8 +11,7 @@ import VnInputNumber from 'components/common/VnInputNumber.vue'; import VnInputDate from 'components/common/VnInputDate.vue'; import VnInputTime from 'components/common/VnInputTime.vue'; import VnComponent from 'components/common/VnComponent.vue'; -import VnDescriptor from 'components/VnTable/VnDescriptor.vue'; -import { QBtn } from 'quasar'; + import VnUserLink from 'components/ui/VnUserLink.vue'; const model = defineModel(undefined, { required: true }); @@ -130,17 +129,7 @@ const defaultComponents = { icon: { component: markRaw(QIcon), }, - descriptor: { - component: markRaw(VnDescriptor), - attrs: { - class: 'link', - flat: true, - dense: true, - }, - forceAttrs: { - row: $props.row, - }, - }, + userLink: { component: markRaw(VnUserLink), }, diff --git a/src/components/VnTable/VnDescriptor.vue b/src/components/VnTable/VnDescriptor.vue deleted file mode 100644 index b280c7f6c..000000000 --- a/src/components/VnTable/VnDescriptor.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 23fd81f3c..d6c961456 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -314,7 +314,11 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) { show-if-above > - +
- + {{ card.name }} diff --git a/src/pages/Ticket/Negative/TicketLackDetail.vue b/src/pages/Ticket/Negative/TicketLackDetail.vue index 0dd099dad..d1dfce79d 100644 --- a/src/pages/Ticket/Negative/TicketLackDetail.vue +++ b/src/pages/Ticket/Negative/TicketLackDetail.vue @@ -101,6 +101,12 @@ const itemProposalSelected = ref(null); // itemProposalSelected.value.available; // } // }; +function onBuysFetched(data) { + Object.assign(item.value, data[0]); +} +function onTicketLackFetched(data) { + itemLack.value = data[0]; +} diff --git a/src/pages/Ticket/Negative/TicketLackFilter.vue b/src/pages/Ticket/Negative/TicketLackFilter.vue index 6482052a3..a3f8a8def 100644 --- a/src/pages/Ticket/Negative/TicketLackFilter.vue +++ b/src/pages/Ticket/Negative/TicketLackFilter.vue @@ -13,10 +13,17 @@ const props = defineProps({ required: true, }, }); +// const arrayData = useArrayData(props.dataKey); +// const warehouse = ref(null); +// onMounted(async () => { +// warehouse.value = arrayData.store?.userParams?.warehouse; +// }); const to = Date.vnNew(); to.setDate(to.getDate() + 1); +const warehouses = ref(); +const categoriesOptions = ref([]); const itemTypesRef = ref(null); const itemTypesOptions = ref([]); @@ -26,9 +33,27 @@ const itemTypesFilter = { order: 'name ASC', where: {}, }; +const onCategoryChange = async (categoryFk, search) => { + if (!categoryFk) { + itemTypesFilter.where.categoryFk = null; + delete itemTypesFilter.where.categoryFk; + } else { + itemTypesFilter.where.categoryFk = categoryFk; + } + search(); + await itemTypesRef.value.fetch(); +};