verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 63 Releases Wiki Activity

solveConflicts_test_to_dev #957

Merged
alexm merged 58 commits from solveConflicts_test_to_dev into dev 2024-11-18 10:21:51 +00:00
Conversation 0 Commits 58 Files Changed 35 +3 -4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 149f92bc93 - Show all commits

7
src/pages/Item/ItemFixedPrice.vue
View File

@ -64,8 +64,7 @@ const columns = computed(() => [
}, },
{ {
label: t('globals.name'), label: t('globals.name'),
field: 'name', name: 'name',
name: 'description',
...defaultColumnAttrs, ...defaultColumnAttrs,
create: true, create: true,
cardVisible: true, cardVisible: true,
@ -426,7 +425,7 @@ function handleOnDataSave({ CrudModelRef }) {
:default-save="false" :default-save="false"
data-key="ItemFixedPrices" data-key="ItemFixedPrices"
url="FixedPrices/filter" url="FixedPrices/filter"
:order="['description DESC']" :order="['itemFk DESC', 'name DESC']"
save-url="FixedPrices/crud" save-url="FixedPrices/crud"
:user-params="{ warehouseFk: user.warehouseFk }" :user-params="{ warehouseFk: user.warehouseFk }"
ref="tableRef" ref="tableRef"
@ -480,7 +479,7 @@ function handleOnDataSave({ CrudModelRef }) {
</template> </template>
</VnSelect> </VnSelect>
</template> </template>
<template #column-description="{ row }"> <template #column-name="{ row }">
<span class="link"> <span class="link">
{{ row.name }} {{ row.name }}
</span> </span>