#7283 #7831 itemMigration #553

Merged
carlossa merged 77 commits from 7283-itemMigration into dev 2024-10-25 07:09:13 +00:00
1 changed files with 17 additions and 6 deletions
Showing only changes of commit f2cb0111eb - Show all commits

View File

@ -1,10 +1,9 @@
<script setup>
import { ref, computed, onUnmounted } from 'vue';
import { ref, computed } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRouter, useRoute } from 'vue-router';
import VnImg from 'src/components/ui/VnImg.vue';
import VnTable from 'components/VnTable/VnTable.vue';
import { useStateStore } from 'stores/useStateStore';
import { toDate } from 'src/filters';
import axios from 'axios';
import FetchedTags from 'src/components/ui/FetchedTags.vue';
@ -16,7 +15,6 @@ const entityId = computed(() => route.params.id);
const { viewSummary } = useSummaryDialog();
const router = useRouter();
const stateStore = useStateStore();
const { t } = useI18n();
const tableRef = ref();
const route = useRoute();
@ -53,8 +51,8 @@ const columns = computed(() => [
attrs: ({ row }) => {
return {
id: row?.id,
width: '50px',
zoomResolution: '1600x900',
zoom: true,
};
},
},
@ -116,9 +114,13 @@ const columns = computed(() => [
},
{
label: t('item.list.typeName'),
name: 'typeName',
name: 'typeFk',
align: 'left',
component: 'select',
attrs: {
url: 'ItemTypes',
fields: ['id', 'name'],
},
columnFilter: {
name: 'typeFk',
attrs: {
@ -152,6 +154,11 @@ const columns = computed(() => [
name: 'intrastat',
align: 'left',
component: 'select',
attrs: {
url: 'Intrastats',
optionValue: 'description',
optionLabel: 'description',
},
columnFilter: {
name: 'description',
attrs: {
@ -159,7 +166,6 @@ const columns = computed(() => [
optionValue: 'description',
optionLabel: 'description',
},
inWhere: true,
alias: 'intr',
},
columnField: {
@ -172,6 +178,11 @@ const columns = computed(() => [
name: 'origin',
align: 'left',
component: 'select',
attrs: {
url: 'Origins',
optionValue: 'id',
optionLabel: 'code',
},
columnFilter: {
name: 'id',
attrs: {