8231_testToMaster_2448 #997

Merged
alexm merged 400 commits from 8231_testToMaster_2448 into master 2024-11-26 06:28:29 +00:00
2 changed files with 44 additions and 19 deletions
Showing only changes of commit b668d07e2d - Show all commits

View File

@ -7,6 +7,7 @@ import VnTable from 'components/VnTable/VnTable.vue';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { toDate } from 'src/filters'; import { toDate } from 'src/filters';
import axios from 'axios'; import axios from 'axios';
import FetchedTags from 'src/components/ui/FetchedTags.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import ItemSummary from '../Item/Card/ItemSummary.vue'; import ItemSummary from '../Item/Card/ItemSummary.vue';
@ -43,21 +44,21 @@ const itemFilter = {
], ],
}; };
const columns = computed(() => [ const columns = computed(() => [
{ // {
label: '', // label: '',
name: 'image', // name: 'image',
align: 'left', // align: 'left',
columnField: { // columnField: {
component: VnImg, // component: VnImg,
attrs: (id) => { // attrs: (id) => {
return { // return {
id, // id,
width: '50px', // width: '50px',
}; // };
}, // },
}, // },
columnFilter: false, // columnFilter: false,
}, // },
{ {
label: t('item.list.id'), label: t('item.list.id'),
name: 'id', name: 'id',
@ -280,9 +281,24 @@ const cloneItem = async (itemFk) => {
<WorkerDescriptorProxy :id="row.buyerFk" /> <WorkerDescriptorProxy :id="row.buyerFk" />
</span> </span>
</template> </template>
<template #column-description="{ row }">
<div class="row column full-width justify-between items-start">
{{ row?.name }}
<div v-if="row?.subName" class="subName">
{{ row?.subName.toUpperCase() }}
</div>
</div>
<FetchedTags :item="row" :max-length="6" />
</template>
</VnTable> </VnTable>
</template> </template>
<style lang="scss" scoped>
.subName {
text-transform: uppercase;
color: var(--vn-label-color);
}
</style>
<i18n> <i18n>
es: es:
New item: Nuevo artículo New item: Nuevo artículo

View File

@ -13,7 +13,6 @@ import VnTable from 'components/VnTable/VnTable.vue';
const { t } = useI18n(); const { t } = useI18n();
const { notify } = useNotify(); const { notify } = useNotify();
const stateStore = useStateStore(); const stateStore = useStateStore();
const workersOptions = ref([]);
let filterParams = ref({}); let filterParams = ref({});
const denyFormRef = ref(null); const denyFormRef = ref(null);
const denyRequestId = ref(null); const denyRequestId = ref(null);
@ -91,6 +90,7 @@ const columns = computed(() => [
name: 'item', name: 'item',
align: 'left', align: 'left',
component: 'input', component: 'input',
visible: false,
}, },
{ {
label: t('item.buyRequest.achieved'), label: t('item.buyRequest.achieved'),
@ -98,6 +98,7 @@ const columns = computed(() => [
name: 'achieved', name: 'achieved',
align: 'left', align: 'left',
component: 'input', component: 'input',
visible: false,
}, },
{ {
label: t('item.buyRequest.concept'), label: t('item.buyRequest.concept'),
@ -106,6 +107,7 @@ const columns = computed(() => [
align: 'left', align: 'left',
sortable: true, sortable: true,
component: 'input', component: 'input',
visible: false,
}, },
{ {
label: t('item.buyRequest.state'), label: t('item.buyRequest.state'),
@ -114,10 +116,17 @@ const columns = computed(() => [
align: 'left', align: 'left',
}, },
{ {
align: 'right',
label: '', label: '',
name: 'action', name: 'tableActions',
align: 'left', actions: [
columnFilter: null, {
title: t('Client ticket list'),
icon: 'thumb_down',
action: onDenyAccept,
isPrimary: true,
},
],
}, },
]); ]);