Merge branch 'dev' into warmFix_order_equalSalix
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Alex Moreno 2024-11-13 06:21:59 +00:00
commit 2ae9d68fec
6 changed files with 7 additions and 4 deletions

View File

@ -38,7 +38,7 @@ const onDataSaved = (dataSaved) => {
@on-fetch="(data) => (warehousesOptions = data)" @on-fetch="(data) => (warehousesOptions = data)"
auto-load auto-load
url="Warehouses" url="Warehouses"
:filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }" :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
/> />
<FetchData <FetchData
@on-fetch="(data) => (temperaturesOptions = data)" @on-fetch="(data) => (temperaturesOptions = data)"

View File

@ -25,7 +25,7 @@ const showSmsDialog = () => {
quasar.dialog({ quasar.dialog({
component: VnSmsDialog, component: VnSmsDialog,
componentProps: { componentProps: {
phone: $props.customer.phone || $props.customer.mobile, phone: $props.customer.mobile || $props.customer.phone,
promise: sendSms, promise: sendSms,
}, },
}); });

View File

@ -191,6 +191,7 @@ const getItemPackagingType = (ticketSales) => {
class="full-width" class="full-width"
:disable-infinite-scroll="true" :disable-infinite-scroll="true"
:search-url="false" :search-url="false"
redirect="ticket"
> >
<template #column-nickname="{ row }"> <template #column-nickname="{ row }">
<span class="link"> <span class="link">

View File

@ -281,6 +281,7 @@ function round(value) {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
min-width: 35%;
} }
.text-negative { .text-negative {
color: $negative !important; color: $negative !important;

View File

@ -207,6 +207,7 @@ const onThermographCreated = async (data) => {
option-label="thermographFk" option-label="thermographFk"
:disable="viewAction === 'edit'" :disable="viewAction === 'edit'"
:tooltip="t('New thermograph')" :tooltip="t('New thermograph')"
:roles-allowed-to-create="['logistic']"
> >
<template #form> <template #form>
<CreateThermographForm <CreateThermographForm

View File

@ -96,7 +96,7 @@ watch(
sort-by="code, townFk" sort-by="code, townFk"
option-value="geoFk" option-value="geoFk"
option-label="code" option-label="code"
:filter-options="['code', 'geoFk']" :filter-options="['code']"
hide-selected hide-selected
dense dense
outlined outlined