forked from verdnatura/salix-front
Merge branch 'dev' into warmFix_order_equalSalix
This commit is contained in:
commit
2ae9d68fec
|
@ -38,7 +38,7 @@ const onDataSaved = (dataSaved) => {
|
|||
@on-fetch="(data) => (warehousesOptions = data)"
|
||||
auto-load
|
||||
url="Warehouses"
|
||||
:filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
|
||||
:filter="{ fields: ['id', 'name'], order: 'name ASC' }"
|
||||
/>
|
||||
<FetchData
|
||||
@on-fetch="(data) => (temperaturesOptions = data)"
|
||||
|
|
|
@ -25,7 +25,7 @@ const showSmsDialog = () => {
|
|||
quasar.dialog({
|
||||
component: VnSmsDialog,
|
||||
componentProps: {
|
||||
phone: $props.customer.phone || $props.customer.mobile,
|
||||
phone: $props.customer.mobile || $props.customer.phone,
|
||||
promise: sendSms,
|
||||
},
|
||||
});
|
||||
|
|
|
@ -191,6 +191,7 @@ const getItemPackagingType = (ticketSales) => {
|
|||
class="full-width"
|
||||
:disable-infinite-scroll="true"
|
||||
:search-url="false"
|
||||
redirect="ticket"
|
||||
>
|
||||
<template #column-nickname="{ row }">
|
||||
<span class="link">
|
||||
|
|
|
@ -281,6 +281,7 @@ function round(value) {
|
|||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
min-width: 35%;
|
||||
}
|
||||
.text-negative {
|
||||
color: $negative !important;
|
||||
|
|
|
@ -207,6 +207,7 @@ const onThermographCreated = async (data) => {
|
|||
option-label="thermographFk"
|
||||
:disable="viewAction === 'edit'"
|
||||
:tooltip="t('New thermograph')"
|
||||
:roles-allowed-to-create="['logistic']"
|
||||
>
|
||||
<template #form>
|
||||
<CreateThermographForm
|
||||
|
|
|
@ -96,7 +96,7 @@ watch(
|
|||
sort-by="code, townFk"
|
||||
option-value="geoFk"
|
||||
option-label="code"
|
||||
:filter-options="['code', 'geoFk']"
|
||||
:filter-options="['code']"
|
||||
hide-selected
|
||||
dense
|
||||
outlined
|
||||
|
|
Loading…
Reference in New Issue