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