8627-devToTest #1421

Merged
alexm merged 768 commits from 8627-devToTest into test 2025-02-18 12:37:37 +00:00
1 changed files with 6 additions and 14 deletions
Showing only changes of commit bded06082a - Show all commits

View File

@ -1,13 +1,10 @@
<script setup> <script setup>
import { ref, computed, onUnmounted } from 'vue'; import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue'; import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
import FetchedTags from 'components/ui/FetchedTags.vue';
import VnImg from 'src/components/ui/VnImg.vue';
import { toCurrency } from 'filters/index'; import { toCurrency } from 'filters/index';
import VnStockValueDisplay from 'src/components/ui/VnStockValueDisplay.vue'; import VnStockValueDisplay from 'src/components/ui/VnStockValueDisplay.vue';
import VnTable from 'src/components/VnTable/VnTable.vue'; import VnTable from 'src/components/VnTable/VnTable.vue';
import VnInput from 'src/components/common/VnInput.vue';
const MATCH_VALUES = [5, 6, 7, 8]; const MATCH_VALUES = [5, 6, 7, 8];
const { t } = useI18n(); const { t } = useI18n();
@ -173,7 +170,10 @@ async function confirm(row) {
console.error(error); console.error(error);
} }
} }
onUnmounted(() => {}); const filter = computed(() => ({
itemFk: $props.itemLack.itemFk,
sales: saleFk.value,
}));
function handleSelection(value, _) { function handleSelection(value, _) {
quantity.value = value.available; quantity.value = value.available;
} }
@ -198,12 +198,7 @@ const isDisabled = (row) => !isSelectionAvailable(row);
ref="proposalTableRef" ref="proposalTableRef"
data-key="ItemsGetSimilar" data-key="ItemsGetSimilar"
url="Items/getSimilar" url="Items/getSimilar"
:filter="{ :user-filter="filter"
where: {
itemFk: $props.itemLack.itemFk,
warehouseFk: $props.itemLack.warehouseFk,
},
}"
auto-load auto-load
:columns="columns" :columns="columns"
class="full-width q-mt-md" class="full-width q-mt-md"
@ -212,9 +207,6 @@ const isDisabled = (row) => !isSelectionAvailable(row);
:right-search="false" :right-search="false"
:without-header="true" :without-header="true"
:disable-option="{ card: true, table: true }" :disable-option="{ card: true, table: true }"
:table="{
'row-key': 'id',
}"
> >
<template #column-longName="{ row }"> <template #column-longName="{ row }">
<QTd <QTd