diff --git a/src/pages/Item/components/ItemProposal.vue b/src/pages/Item/components/ItemProposal.vue index ac9404808..64ee170fe 100644 --- a/src/pages/Item/components/ItemProposal.vue +++ b/src/pages/Item/components/ItemProposal.vue @@ -11,6 +11,7 @@ const session = useSession(); const $props = defineProps({ item: { type: Object, + required: true, default: () => {}, }, }); diff --git a/src/pages/Ticket/Negative/TicketLackDetail.vue b/src/pages/Ticket/Negative/TicketLackDetail.vue index 70e4cf352..5823de2ad 100644 --- a/src/pages/Ticket/Negative/TicketLackDetail.vue +++ b/src/pages/Ticket/Negative/TicketLackDetail.vue @@ -40,7 +40,7 @@ const selectedRows = ref([]); const originalRowDataCopy = ref(null); const $props = defineProps({ - id: { + item: { type: Number, required: true, }, @@ -97,7 +97,7 @@ const saveChange = async (field, { rowIndex, row }) => { console.error('Error saving changes', err); } }; -const entityId = computed(() => $props.id); +const entityId = computed(() => $props.item.itemFk); function isComponentVn(col) { return tableColumnComponents?.value[col.name]?.component === 'span' ?? false; } @@ -464,11 +464,11 @@ const handleRows = (rows) => { {{ col.value }} - {{ col.value }} - @@ -498,10 +498,11 @@ const handleRows = (rows) => { v-model="showSplitDialog" :tickets="resultSplit" > + {{ item }} diff --git a/src/pages/Ticket/Negative/TicketLackFilter.vue b/src/pages/Ticket/Negative/TicketLackFilter.vue index 7d4129f52..93e2e1f6d 100644 --- a/src/pages/Ticket/Negative/TicketLackFilter.vue +++ b/src/pages/Ticket/Negative/TicketLackFilter.vue @@ -26,6 +26,8 @@ to.setDate(to.getDate() + 1); const warehouses = ref(); const categoriesOptions = ref([]); const itemTypesRef = ref(null); +const itemTypesOptions = ref([]); + const itemTypesFilter = { fields: ['id', 'name', 'categoryFk'], include: 'category', @@ -53,10 +55,17 @@ const onCategoryChange = async (categoryFk, search) => { auto-load /> + (itemTypesOptions = data)" + /> + - {{ t(`negative.${tag.label}`) }}: + {{ t(`negative.${tag.label}`) }} {{ formatFn(tag.value) }} @@ -103,31 +112,62 @@ const onCategoryChange = async (categoryFk, search) => { /> - - - onCategoryChange($event, searchFn) - " - :options="categoriesOptions" - option-value="id" - option-label="name" - hide-selected - dense - outlined - rounded - /> - - - + + + + onCategoryChange($event, searchFn) + " + :options="categoriesOptions" + option-value="id" + option-label="name" + hide-selected + dense + outlined + rounded + /> + + + + + + + + + + {{ scope.opt?.name }} + {{ + scope.opt?.category?.name + }} + + + + + + + + { (currentRow = null)" > diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml index bb358a3df..62faafef3 100644 --- a/src/pages/Ticket/locale/en.yml +++ b/src/pages/Ticket/locale/en.yml @@ -8,19 +8,20 @@ negative: origen: 'Origin' value: 'Negative' itemFk: 'Article' - warehouseFk: 'Warehouse' producer: 'Producer' - category: 'category' + warehouse: 'Warehouse' + warehouseFk: 'Warehouse' + category: 'Category' categoryFk: 'Family' - warehouse: 'warehouse' + type: 'Type' + typeFk: 'Type' lack: 'Negative' inkFk: 'inkFk' timed: 'timed' minTimed: 'minTimed' - type: 'Type' negativeAction: 'Negative' totalNegative: 'Total negatives' - days: Dias + days: Days modalOrigin: title: 'Update negatives' question: 'Select a state to update' diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml index 7de0d3447..3e08f9bc9 100644 --- a/src/pages/Ticket/locale/es.yml +++ b/src/pages/Ticket/locale/es.yml @@ -11,8 +11,9 @@ negative: value: 'Negativo' warehouseFk: 'Almacen' producer: 'Producer' - category: 'Categoria' + category: 'CategorÃa' categoryFk: 'Familia' + typeFk: 'Familia' warehouse: 'Almacen' lack: 'Negativo' inkFk: 'Color'